Fix SIS3301 and SIS3316 merging

Fixed merging of SIS3301 and SIS3316 modules from the FRIB DAQ.

Author: DBazin

libattpc_merger/src/config.rs

@@ -72,13 +72,9 @@ impl Config {
 
     /// Get the path to the online data, assuming the standard AT-TPC Server configuration
     pub fn get_online_directory(&self, run_number: i32, cobo: &u8) -> Result<PathBuf, ConfigError> {
-<<<<<<< Updated upstream
         let mut online_dir: PathBuf = PathBuf::new().join(format!(
             "/Network/Servers/mm{cobo}.local/Users/attpc/Data/mm{cobo}"
         ));
-=======
-        let mut online_dir: PathBuf = PathBuf::new().join(format!("/Network/Servers/mm{}.local/Users/attpc/Data/mm{}", cobo, cobo));
->>>>>>> Stashed changes
         online_dir = online_dir.join(&self.experiment);
         online_dir = online_dir.join(self.get_run_str(run_number));
         if online_dir.exists() {
@@ -90,8 +86,8 @@ impl Config {
 
     /// Get the path to the FRIBDAQ directory, assuming the standard AT-TPC configuration
     pub fn get_evt_directory(&self, run_number: i32) -> Result<PathBuf, ConfigError> {
-//        let run_dir: PathBuf = self.evt_path.join(format!("run{run_number}"));
-        let run_dir: PathBuf = self.evt_path.join("");
+        let run_dir: PathBuf = self.evt_path.join(format!("run{run_number}"));
+//        let run_dir: PathBuf = self.evt_path.clone();
         if run_dir.exists() {
             Ok(run_dir)
         } else {

libattpc_merger/src/ring_item.rs

@@ -1,6 +1,6 @@
 use super::error::EvtItemError;
 use byteorder::{LittleEndian, ReadBytesExt};
-use std::{fmt::UpperHex, io::{Cursor, Read}};
+use std::io::{Cursor, Read};
 
 //These are the literal values for the different ring item type fields
 const BEGIN_RUN_VAL: u8 = 1;
@@ -317,7 +317,6 @@ impl TryFrom<RingItem> for PhysicsItem {
             } else if tag == 0x977 {
                 info.coinc.extract_data(&mut cursor)?;
             } else if tag == 0xFFFF {
-                cursor.set_position(cursor.position() - 2);
                 break;
             }
             else {
@@ -393,7 +392,7 @@ impl SIS3300Item {
         &mut self,
         cursor: &mut std::io::Cursor<Vec<u8>>,
     ) -> Result<(), EvtItemError> {
-        let group_enable_flags = cursor.read_u16::<LittleEndian>()?;
+        let _group_enable_flags = cursor.read_u16::<LittleEndian>()?;
         let _daq_register = cursor.read_u32::<LittleEndian>()?; //Never used, but must be read
 
         //Important buffer elements