Merge pull request #1888 from ehrlich-uva/CrvCalibration

Updated CRV channel map

Author: oksuzian

CRVConditions/data/calib_extracted_20260716.txt

@@ -0,0 +1,17 @@
+TABLE CRVBadChan
+#A channel can have more than one status bit. Add all status bits for the complete status.
+#status 1 (bit 0): not connected
+#status 2 (bit 1): ignore channel in reconstruction
+#status 4 (bit 2): no data
+#status 8 (bit 3): no pedestal
+#status 16 (bit 4): no calibration constant
+#status 32 (bit 5): noisy
+#channel,status
+281,3
+296,3
+518,3
+520,3
+863,3
+1107,3
+1587,3
+2246,3

CRVConditions/data/extracted_v04.txt

@@ -86,8 +86,8 @@ cet_build_plugin(CrvWidebandTriggerFilter art::module
       Offline::RecoDataProducts
 )
 
-cet_build_plugin(CrvTimingStudies art::module
-    REG_SOURCE src/CrvTimingStudies_module.cc
+cet_build_plugin(CrvTimeOffsets art::module
+    REG_SOURCE src/CrvTimeOffsets_module.cc
     LIBRARIES REG
       art_root_io::TFileService_service
       Offline::CRVReco

CRVConditions/data/status_extracted_20260716.txt

@@ -87,7 +87,6 @@ namespace mu2e
     ProditionsHandle<CRVCalib> _calib_h;
 
     std::vector<double> _pedestals;
-    std::vector<double> _timeOffsets;
   };
 
 
@@ -122,7 +121,6 @@ namespace mu2e
     _calibHistsPulseArea.reserve(counters.size()*CRVId::nChanPerBar);
     _calibHistsPulseHeight.reserve(counters.size()*CRVId::nChanPerBar);
     _pedestals.resize(counters.size()*CRVId::nChanPerBar);
-    _timeOffsets.resize(counters.size()*CRVId::nChanPerBar);
 
     art::ServiceHandle<art::TFileService> tfs;
     for(size_t barIndex=0; barIndex<counters.size(); ++barIndex)
@@ -138,7 +136,6 @@ namespace mu2e
                                                  Form("crvCalibrationHistPulseHeight_%lu",channelIndex),
                                                  _histBinsPulseHeight,0,_histMaxPulseHeight));
         _pedestals[channelIndex]=0;
-        _timeOffsets[channelIndex]=0;
       }
     }
   }
@@ -180,23 +177,6 @@ namespace mu2e
       treePedestal->Fill(); //fill tree
     }
 
-    outputFile<<std::endl;
-
-    //time offsets
-    TTree *treeTimeOffset = tfs->make<TTree>("crvTimeOffsets","crvTimeOffsets");
-    double offset;
-    treeTimeOffset->Branch("channel", &channel);
-    treeTimeOffset->Branch("timeOffset", &offset);
-
-    outputFile<<"TABLE CRVTime"<<std::endl;
-    outputFile<<"#channel,timeOffset"<<std::endl;
-    for(channel=0; channel<_timeOffsets.size(); ++channel)
-    {
-      offset=_timeOffsets.at(channel);
-      outputFile<<channel<<","<<offset<<std::endl;  //write to DB text file
-      treeTimeOffset->Fill(); //fill tree
-    }
-
     outputFile.close();
   }
 
@@ -215,7 +195,6 @@ namespace mu2e
       for(size_t channelIndex=0; channelIndex<_pedestals.size(); ++channelIndex)
       {
         _pedestals[channelIndex] = calib.pedestal(channelIndex);
-        _timeOffsets[channelIndex] = calib.timeOffset(channelIndex);
       }
     }
 

CRVReco/CMakeLists.txt

@@ -26,7 +26,6 @@
 
 #include <TH1F.h>
 #include <TF1.h>
-#include <TTree.h>
 
 namespace mu2e
 {
@@ -64,10 +63,6 @@ namespace mu2e
     double             _maxADCspread;
     std::string        _tmpDBfileName;
     std::vector<TH1F*> _pedestalHists;
-
-    ProditionsHandle<CRVCalib> _calib_h;
-
-    std::vector<double> _timeOffsets;
   };
 
 
@@ -91,7 +86,6 @@ namespace mu2e
     GeomHandle<CosmicRayShield> CRS;
     const std::vector<std::shared_ptr<CRSScintillatorBar> > &counters = CRS->getAllCRSScintillatorBars();
     _pedestalHists.reserve(counters.size()*CRVId::nChanPerBar);
-    _timeOffsets.resize(counters.size()*CRVId::nChanPerBar);
 
     art::ServiceHandle<art::TFileService> tfs;
     for(size_t barIndex=0; barIndex<counters.size(); ++barIndex)
@@ -103,7 +97,6 @@ namespace mu2e
         _pedestalHists.emplace_back(tfs->make<TH1F>(Form("crvPedestalHist_%lu",channelIndex),
                                                     Form("crvPedestalHist_%lu",channelIndex),
                                                     _histBins,_histMin,_histMax));
-        _timeOffsets[channelIndex]=0;
       }
     }
   }
@@ -144,25 +137,6 @@ namespace mu2e
       outputFile<<channel<<","<<funcPedestal.GetParameter(1)<<",-1,-1"<<std::endl;  //only print out pedestal values
     }
 
-    outputFile<<std::endl;
-
-    //time offsets
-    art::ServiceHandle<art::TFileService> tfs;
-    TTree *treeTimeOffsets = tfs->make<TTree>("crvTimeOffsets","crvTimeOffsets");
-    size_t channel;
-    double offset;
-    treeTimeOffsets->Branch("channel", &channel);
-    treeTimeOffsets->Branch("timeOffset", &offset);
-
-    outputFile<<"TABLE CRVTime"<<std::endl;
-    outputFile<<"#channel, timeOffset"<<std::endl;
-    for(channel=0; channel<_timeOffsets.size(); ++channel)
-    {
-      offset=_timeOffsets.at(channel);
-      outputFile<<channel<<","<<offset<<std::endl;  //write to temporary DB text file
-      treeTimeOffsets->Fill(); //fill tree
-    }
-
     outputFile.close();
   }
 
@@ -171,19 +145,6 @@ namespace mu2e
     art::Handle<CrvDigiCollection> crvDigiCollection;
     if(!event.getByLabel(_crvDigiModuleLabel,(_useNZS?"NZS":""),crvDigiCollection)) return;
 
-    //find time offsets from first event
-    //need to assume that this is only used for calibration runs where the time offsets stay constant over the entire run
-    static bool first=true;
-    if(first)
-    {
-      first=false;
-      auto const& calib = _calib_h.get(event.id());
-      for(size_t channelIndex=0; channelIndex<_timeOffsets.size(); ++channelIndex)
-      {
-        _timeOffsets[channelIndex] = calib.timeOffset(channelIndex);
-      }
-    }
-
     for(auto iter=crvDigiCollection->begin(); iter!=crvDigiCollection->end(); ++iter)
     {
       int barIndex = iter->GetScintillatorBarIndex().asInt();