modified: src/histoer/histogrammer.rs

modified: src/histogram_scripter/custom_scripts.rs
alconley · Feb 6, 2025 · a566ccd · a566ccd
1 parent 5c0b88c
commit a566ccd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/histoer/histogrammer.rs b/src/histoer/histogrammer.rs
@@ -295,14 +295,14 @@ impl Histogrammer {
             })
             .collect();
 
-        let pool = rayon::ThreadPoolBuilder::new()
-            .num_threads(4) // choose a number lower than the total core count
-            .build()
-            .unwrap();
+        // let pool = rayon::ThreadPoolBuilder::new()
+        //     .num_threads(4) // choose a number lower than the total core count
+        //     .build()
+        //     .unwrap();
 
         // Spawn the batch processing task asynchronously
-        // rayon::spawn({
-        pool.spawn({
+        rayon::spawn({
+            // pool.spawn({
             let calculating = Arc::clone(&calculating);
             let lf = Arc::clone(&lf); // Clone lf to move into the spawn closure
             let progress_bar = progress_bar.clone();
@@ -337,6 +337,8 @@ impl Histogrammer {
                                     |(index, value)| {
                                         if value != -1e6 && meta.cuts.valid(&df, index) {
                                             hist.fill(value);
+                                        }
+                                        if index == height || index == 0 {
                                             hist.plot_settings.egui_settings.reset_axis = true;
                                         }
                                     },
@@ -359,23 +361,18 @@ impl Histogrammer {
                                         if x != -1e6 && y != -1e6 && meta.cuts.valid(&df, index) {
                                             hist.fill(x, y);
                                         }
+                                        if index == height {
+                                            hist.plot_settings.recalculate_image = true;
+                                            hist.plot_settings.egui_settings.reset_axis = true;
+                                            hist.plot_settings.x_column =
+                                                meta.x_column_name.clone();
+                                            hist.plot_settings.y_column =
+                                                meta.y_column_name.clone();
+                                        }
                                     });
                             }
                         });
 
-                        hist2d_map.par_iter().for_each(|(hist, meta)| {
-                            let mut hist = hist.lock().unwrap();
-                            hist.plot_settings.recalculate_image = true;
-                            hist.plot_settings.egui_settings.reset_axis = true;
-                            hist.plot_settings.x_column = meta.x_column_name.clone();
-                            hist.plot_settings.y_column = meta.y_column_name.clone();
-                        });
-
-                        hist1d_map.par_iter().for_each(|(hist, _)| {
-                            let mut hist = hist.lock().unwrap();
-                            hist.plot_settings.egui_settings.reset_axis = true;
-                        });
-
                         progress_bar.inc(height as u64);
 
                         // Update progress as a percentage

diff --git a/src/histogram_scripter/custom_scripts.rs b/src/histogram_scripter/custom_scripts.rs
@@ -1057,7 +1057,7 @@ impl PIPS {
                         let tcut = Some(Cuts::new(vec![pips_cebra_tcut.clone(), valid_time_cut.clone()]));
 
                         configs.hist1d(&format!("{}/Time Cut/PIPS{}TimeRelToCebra{}TimeShifted", base_path, self.name, cebr3.number), &format!("PIPS{}TimeRelToCebra{}TimeShifted", self.name, cebr3.number), time_range, time_bins, tcut.clone());
-                        configs.hist1d(&format!("ICESPICE/PIPS{}/Time Cut - PIPS{}TimeRelToCeBrA", self.name, self.name), &format!("PIPS{}TimeRelToCebra{}TimeShifted", self.name, cebr3.number), time_range, time_bins, tcut.clone());
+                        configs.hist1d(&format!("ICESPICE/PIPS{}/CeBrA/Time Cut - PIPS{}TimeRelToCeBrA", self.name, self.name), &format!("PIPS{}TimeRelToCebra{}TimeShifted", self.name, cebr3.number), time_range, time_bins, tcut.clone());
 
                         configs.hist2d(&format!("{}/Time Cut/PIPS{}Energy v Cebra{}Energy", base_path, self.name, cebr3.number), &cebr3_energy, &energy, cebr3_range, pips_range, (cebr3_bins, pips_bins), tcut.clone());
                         configs.hist2d(&format!("{}/Time Cut/PIPS{}RelToCebra{}Shifted v Cebra{}Energy", base_path, self.name, cebr3.number, cebr3.number), &format!("PIPS{}TimeRelToCebra{}TimeShifted", self.name, cebr3.number), &cebr3_energy, time_range, cebr3_range, (time_bins, cebr3_bins), tcut.clone());
@@ -1071,7 +1071,7 @@ impl PIPS {
                         }
                         if cebr3.energy_calibration.active {
                             configs.hist2d(&format!("{}/Time Cut/Energy Calibrated/PIPS{}TimeRelToCebra{}TimeShifted v Cebra{}EnergyCalibrated", base_path, self.name, cebr3.number, cebr3.number), &format!("PIPS{}TimeRelToCebra{}TimeShifted", self.name, cebr3.number), &cebr3_energy_calibrated, time_range, cebr3.energy_calibration.range, (time_bins, cebr3.energy_calibration.bins), tcut.clone());
-                            configs.hist2d(&format!("ICESPICE/PIPS{}/Time Cut - PIPS{}TimeRelToCeBrA v CeBrA", base_path, self.name), &format!("PIPS{}TimeRelToCebra{}TimeShifted", self.name, cebr3.number), &cebr3_energy_calibrated, time_range, cebr3.energy_calibration.range, (time_bins, cebr3.energy_calibration.bins), tcut.clone());
+                            configs.hist2d(&format!("ICESPICE/PIPS{}/CeBrA/Time Cut - PIPS{}TimeRelToCeBrA v CeBrA", self.name, self.name), &format!("PIPS{}TimeRelToCebra{}TimeShifted", self.name, cebr3.number), &cebr3_energy_calibrated, time_range, cebr3.energy_calibration.range, (time_bins, cebr3.energy_calibration.bins), tcut.clone());
 
                         }
                     }