gondola 0.11.47__tar.gz → 0.11.50__tar.gz

{gondola-0.11.47 → gondola-0.11.50}/Cargo.lock

@@ -1361,7 +1361,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "gondola-core"
-version = "0.11.47"
+version = "0.11.50"
 dependencies = [
  "cfg-if 1.0.0",
  "chrono",

{gondola-0.11.47 → gondola-0.11.50}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gondola-core"
-version = "0.11.47"
+version = "0.11.50"
 edition = "2024"
 readme = "README.md"
 

{gondola-0.11.47 → gondola-0.11.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gondola
-Version: 0.11.47
+Version: 0.11.50
 Requires-Dist: tqdm>=4.0
 Requires-Dist: numpy>=2.3
 Requires-Dist: matplotlib>=3.10

{gondola-0.11.47 → gondola-0.11.50}/python/gondola/db.py

@@ -36,12 +36,19 @@ TofPaddleTimingConstant            = _gc.db.TofPaddleTimingConstant
 TofPaddleTimingConstant.__module__ = __name__ 
 TofPaddleTimingConstant.__name__   = 'TofPaddleTimingConstant'
 get_all_rbids_in_db          = _gc.db.get_all_rbids_in_db
+get_all_rbids_in_db.__module__ = __name__
+
 get_hid_vid_map              = _gc.db.get_hid_vid_map
+get_hid_vid_map.__module__   = __name__ 
+
 get_vid_hid_map              = _gc.db.get_vid_hid_map
+get_vid_hid_map.__module__   = __name__ 
+
 get_dsi_j_ch_pid_map         = _gc.db.get_dsi_j_ch_pid_map
+get_dsi_j_ch_pid_map.__module__ = __name__
 
 __all__ = ['TofPaddle','ReadoutBoard', 'TofPaddleTimingConstant', 'TrackerStrip','TrackerStripPedestal', 'TrackerStripTransferFunction',\
-'TrackerStripCmnNoise']
+'TrackerStripCmnNoise','get_all_rbids_in_db','get_hid_vid_map','get_vid_hid_map','get_dsi_j_ch_pid_map']
 
 #----------------------------------------
 # extend the TofPaddles with a few methods

{gondola-0.11.47 → gondola-0.11.50}/python/gondola/events.py

@@ -29,10 +29,15 @@ TelemetryEvent.__module__ = __name__
 TelemetryEvent.__name__ = 'TelemetryEvent' 
 # functions 
 strip_id          =  _gondola_core.events.strip_id           
+strip_id.__module__ = __name__
 # enums
 EventQuality      =  _gondola_core.events.EventQuality       
+EventQuality.__module__ = __name__ 
 TriggerType       =  _gondola_core.events.TriggerType        
+TriggerType.__module__  = __name__ 
 LTBThreshold      =  _gondola_core.events.LTBThreshold       
+LTBThreshold.__module__ = __name__ 
 EventStatus       =  _gondola_core.events.EventStatus        
+EventStatus.__module__  = __name__
 DataType          =  _gondola_core.events.DataType           
-
+DataType.__module__     = __name__

{gondola-0.11.47 → gondola-0.11.50}/python/gondola/tof/__init__.py

@@ -68,47 +68,56 @@ MasterTrigger.__name__   = 'MasterTrigger'
 
 ## command factories
 start_run            = _gc.tof.start_run 
-#start_run.__module__ = __name__
+start_run.__module__ = __name__
 #start_run.__name___  = 'start_run'
 #
 stop_run            = _gc.tof.stop_run 
-#stop_run.__module__ = __name__
+stop_run.__module__ = __name__
 #stop_run.__name___  = 'stop_run'
 #
 enable_verification_run            = _gc.tof.enable_verification_run  
-#enable_verification_run.__module__ = __name__
+enable_verification_run.__module__ = __name__
 #enable_verification_run.__name___  = 'enable_verification_run'
 #
 restart_liftofrb    = _gc.tof.restart_liftofrb 
-#restart_liftofrb.___module__ = __name__ 
+restart_liftofrb.__module__ = __name__ 
 #restart_liftofrb.__name__ = 'restart_liftofrb'
 #
 shutdown_all_rbs    = _gc.tof.shutdown_all_rbs
-#shutdown_all_rbs.__module__ = __name__
+shutdown_all_rbs.__module__ = __name__
 #shutdown_all_rbs.__name__   = 'shutdown_all_rbs'
 #
 shutdown_rat        = _gc.tof.shutdown_rat 
-#shutdown_rat.__module__ = __name__ 
+shutdown_rat.__module__ = __name__ 
 #shutdown_rat.__name__   = 'shutdown_rat' 
 #
 shutdown_ratpair    = _gc.tof.shutdown_ratpair
-#shutdown_ratpair.__module__ = __name__ 
+shutdown_ratpair.__module__ = __name__ 
 #shutdown_ratpair.__name__ = 'shutdown_ratpair' 
 #
 shutdown_rb         = _gc.tof.shutdown_rb 
-#shutdown_rb.__module__  = __name__
+shutdown_rb.__module__  = __name__
 #shutdown_rb.__name__    = 'shutdown_rb' 
 #
 shutdown_tofcpu     = _gc.tof.shutdown_tofcpu 
-#shutdown_tofcpu.__module__ = __name__ 
+shutdown_tofcpu.__module__ = __name__ 
 #shutdown_tofcpu.__name__   = 'shutdown_tofcpu'
 #
 run_action_alfa     = _gc.tof.run_action_alfa 
+run_action_alfa.__module__ = __name__
 run_action_bravo    = _gc.tof.run_action_bravo 
+run_action_bravo.__module__ = __name__
 run_action_charlie  = _gc.tof.run_action_charlie 
+run_action_charlie.__module__ = __name__
 run_action_whiskey  = _gc.tof.run_action_whiskey 
+run_action_whiskey.__module__ =  __name__
 run_action_tango    = _gc.tof.run_action_tango 
+run_action_tango.__module__ = __name__
 run_action_foxtrott = _gc.tof.run_action_foxtrott
+run_action_foxtrott.__module__ = __name__
 request_liftof_setitngs = _gc.tof.request_liftof_settings
+request_liftof_setitngs.__module__ = __name__
 apply_settings_diff     = _gc.tof.apply_settings_diff
+apply_settings_diff.__module__ = __name__
 restore_default_config  = _gc.tof.restore_default_config
+restore_default_config.__module__ = __name__

{gondola-0.11.47 → gondola-0.11.50}/src/events/telemetry_event.rs

@@ -269,8 +269,11 @@ impl Serialization for TelemetryEvent {
 impl fmt::Display for TelemetryEvent {
   fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
     let mut repr     = String::from("<TelemetryEvent:");
+    let mut te = self.tof_event.clone();
+    te.calc_gcu_variables();
     let tof_str  = format!("\n  {}", self.tof_event);
     let mut good_hits = 0;
+    
     if self.version == 0 {
       repr += "\n VERSION 0 NOT SUPPORTED!!";
     } else if self.version == 1 {
@@ -280,8 +283,15 @@ impl fmt::Display for TelemetryEvent {
     }
     repr += &(format!("  {}", self.header));
     repr += "\n  ** ** ** MERGED  ** ** **";
-    repr += &(format!("\n  version         {}", self.version));
-    repr += &(format!("\n  event ID        {}", self.event_id));  
+    repr += &(format!("\n  version      {}", self.version));
+    repr += &(format!("\n  event ID     {}", self.event_id));  
+    repr += "\n  ** ** ** TOF GCU VARIABLES  ** ** **";
+    repr += &(format!("\n  n_hits_umb   {}", te.n_hits_umb));
+    repr += &(format!("\n  n_hits_cbe   {}", te.n_hits_cbe));
+    repr += &(format!("\n  n_hits_cor   {}", te.n_hits_cor));
+    repr += &(format!("\n  tot_edep_umb {}", te.tot_edep_umb));  
+    repr += &(format!("\n  tot_edep_cbe {}", te.tot_edep_cbe));  
+    repr += &(format!("\n  tot_edep_cor {}", te.tot_edep_cor));  
     if self.version == 0 {
       repr += "\n VERSION 0 NOT SUPPORTED!!"; 
     }