pass rng around

Author: rerpha

src/howl.rs

@@ -14,7 +14,8 @@ use isis_streaming_data_types::flatbuffers_generated::run_stop_6s4t::{
     RunStop, RunStopArgs, finish_run_stop_buffer,
 };
 use log::{debug, error, warn};
-use rand::{RngExt, rng};
+use rand::{RngExt, rng, Rng};
+use rand::prelude::ThreadRng;
 use rand_distr::{Distribution, Normal};
 use rdkafka::ClientConfig;
 use rdkafka::producer::{BaseProducer, BaseRecord};
@@ -114,6 +115,7 @@ fn generate_run_stop<'a>(fbb: &'a mut FlatBufferBuilder<'_>, job_id: &str) -> &'
 fn produce_messages(
     producer: &BaseProducer,
     fbb: &mut FlatBufferBuilder,
+    rng: &mut ThreadRng,
     frame: i64,
     topic_prefix: &str,
     events_per_message: i32,
@@ -135,6 +137,7 @@ fn produce_messages(
 
         let msg = generate_fake_events(
             fbb,
+            rng,
             frame,
             events_per_message,
             tof_peak,
@@ -168,8 +171,10 @@ fn produce_messages(
     current_job_id
 }
 
+
 fn generate_fake_events<'a>(
     fbb: &'a mut FlatBufferBuilder<'_>,
+    rng: &mut ThreadRng,
     msg_id: i64,
     events_per_message: i32,
     tof_peak: f32,
@@ -179,15 +184,14 @@ fn generate_fake_events<'a>(
     timestamp: f32,
 ) -> &'a [u8] {
     fbb.reset();
-    let mut rng = rand::rng();
 
     let det_ids: Vec<i32> = (0..events_per_message)
         .map(|_| rng.random_range(det_min..=det_max))
         .collect();
 
     let normal = Normal::new(tof_peak, tof_sigma).unwrap();
     let tofs: Vec<i32> = (0..events_per_message)
-        .map(|_| normal.sample(&mut rng) as i32)
+        .map(|_| normal.sample(rng) as i32)
         .collect();
 
     let args = Event44MessageArgs {
@@ -217,13 +221,15 @@ pub fn howl(
 ) {
     // create producer
     let mut fbb = FlatBufferBuilder::new();
+    let mut rng = rand::rng();
 
     let now = SystemTime::now()
         .duration_since(SystemTime::UNIX_EPOCH)
         .unwrap()
         .as_millis() as f32;
     let ev44_size = generate_fake_events(
         &mut fbb,
+        &mut rng,
         0,
         events_per_message,
         tof_peak,
@@ -287,6 +293,7 @@ pub fn howl(
         current_job_id = produce_messages(
             &producer,
             &mut fbb,
+            &mut rng,
             frames,
             &topic_prefix,
             events_per_message,