Read new timing delays

henrylay97 · henrylay97 · commit d63d8c129b14 · 2025-03-27T06:14:51.000-05:00
diff --git a/sbndcode/Geometry/GeometryWrappers/CRTGeoAlg.cc b/sbndcode/Geometry/GeometryWrappers/CRTGeoAlg.cc
@@ -80,20 +80,21 @@ namespace sbnd::crt {
 
             if(std::find(usedModules.begin(), usedModules.end(), moduleName) == usedModules.end())
               {
-                int32_t cableDelayCorrection = 0;
+                int32_t t0DelayCorrection = 0, t1DelayCorrection = 0;
 
                 if(!fMC)
                   {
                     art::ServiceHandle<SBND::CRTCalibService> CalibService;
-                    cableDelayCorrection = CalibService->GetTimingOffsetFromFEBMAC5(mac5);
+                    t0DelayCorrection = CalibService->GetT0CableOffsetFromFEBMAC5(mac5) + CalibService->GetT0CalibOffsetFromFEBMAC5(mac5);
+                    t1DelayCorrection = CalibService->GetT1CableOffsetFromFEBMAC5(mac5) + CalibService->GetT1CalibOffsetFromFEBMAC5(mac5);
                   }
 
                 const std::string stripName = nodeStrip->GetVolume()->GetName();
                 const bool minos = stripName.find("MINOS") != std::string::npos ? true : false;
 
                 usedModules.push_back(moduleName);
                 CRTModuleGeo module  = CRTModuleGeo(nodeModule, auxDet, ad_i, taggerName,
-                                                    cableDelayCorrection, cableDelayCorrection,
+                                                    t0DelayCorrection, t1DelayCorrection,
                                                     invert, minos);
                 fModules.insert(std::pair<std::string, CRTModuleGeo>(moduleName, module));
               }

Original file line number	Diff line number	Diff line change
`@@ -80,20 +80,21 @@ namespace sbnd::crt {`
`80`	`80`
`81`	`81`	`if(std::find(usedModules.begin(), usedModules.end(), moduleName) == usedModules.end())`
`82`	`82`	`{`
`83`		`- int32_t cableDelayCorrection = 0;`
	`83`	`+ int32_t t0DelayCorrection = 0, t1DelayCorrection = 0;`
`84`	`84`
`85`	`85`	`if(!fMC)`
`86`	`86`	`{`
`87`	`87`	`art::ServiceHandle<SBND::CRTCalibService> CalibService;`
`88`		`- cableDelayCorrection = CalibService->GetTimingOffsetFromFEBMAC5(mac5);`
	`88`	`+ t0DelayCorrection = CalibService->GetT0CableOffsetFromFEBMAC5(mac5) + CalibService->GetT0CalibOffsetFromFEBMAC5(mac5);`
	`89`	`+ t1DelayCorrection = CalibService->GetT1CableOffsetFromFEBMAC5(mac5) + CalibService->GetT1CalibOffsetFromFEBMAC5(mac5);`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`const std::string stripName = nodeStrip->GetVolume()->GetName();`
`92`	`93`	`const bool minos = stripName.find("MINOS") != std::string::npos ? true : false;`
`93`	`94`
`94`	`95`	`usedModules.push_back(moduleName);`
`95`	`96`	`CRTModuleGeo module = CRTModuleGeo(nodeModule, auxDet, ad_i, taggerName,`
`96`		`- cableDelayCorrection, cableDelayCorrection,`
	`97`	`+ t0DelayCorrection, t1DelayCorrection,`
`97`	`98`	`invert, minos);`
`98`	`99`	`fModules.insert(std::pair<std::string, CRTModuleGeo>(moduleName, module));`
`99`	`100`	`}`