Feature/aheggest crt t1

icaruscode/CMakeLists.txt

@@ -1,8 +1,8 @@
 
 set( IFDH_ART_DIR $ENV{IFDH_ART_DIR} )
 
+add_subdirectory(Timing)
 add_subdirectory(IcarusObj) 
-
 add_subdirectory(Analysis)
 add_subdirectory(CRT)
 add_subdirectory(Decode)

icaruscode/CRT/CRTPMTMatchingAna_module.cc

@@ -292,9 +292,9 @@ void icarus::crt::CRTPMTMatchingAna::analyze(art::Event const& e)
     xyzt.push_back(rcrt.X());
     xyzt.push_back(rcrt.Y());
     xyzt.push_back(rcrt.Z());
-
-    double tcrt = double(m_gate_start_timestamp - crt->ts0_ns)/1e3;
-    tcrt = -tcrt+1e6;
+    double tcrt = crt->ts1_ns/1e3;
+    /*double tcrt = double(m_gate_start_timestamp - crt->ts0_ns)/1e3;
+      tcrt = -tcrt+1e6;*/
 
     //    double tcrt = (int32_t)crt->ts0_ns;// - fCrtDelay;
     //uint64_t tcrt = crt->ts0_ns;
@@ -331,7 +331,7 @@ void icarus::crt::CRTPMTMatchingAna::analyze(art::Event const& e)
 	}
 
 	double tflash = flash->Time();//*1e3;//-fOpDelay;
-
+	//std::cout << "tflash: " << tflash << "\n";
 	TVector3 rflash(0,flash->YCenter(),flash->ZCenter());
 	TVector3 vdiff = rcrt-rflash;
 	//std::cout << "flash time: "<<flash->Time() << " absdiff : "<< abs(tcrt-tflash)<< std::endl;
@@ -346,8 +346,8 @@ void icarus::crt::CRTPMTMatchingAna::analyze(art::Event const& e)
 	  xyzt.push_back(tflash);
 	  matched = true;
 	  matchtpc = flashList.first;
-
 	  vector<art::Ptr<recob::OpHit>> hits = findManyHits.at(iflash);
+	  std::cout << "Flash matched! tcrt: " << tcrt << ", tflash: " << tflash << ", tdiff: " << tdiff << "\n";
 	  for(auto const& hit : hits) {
 	    double tPmt = hit->PeakTime();//*1.e3;//-fOpDelay;
 	    if( tPmt < flashHitT) {
@@ -395,10 +395,11 @@ void icarus::crt::CRTPMTMatchingAna::analyze(art::Event const& e)
     double pemax = 0.;
     for(auto const& hit : opHitList) {
       double thit = hit->PeakTime();//*1e3-fOpDelay;
+
       if(hit->PE()<fHitPeThresh){
 	continue;
       }
-
+      //std::cout << "thit: " << thit << "\n";
 
       //if(abs(tcrt-thit)<abs(tdiff)) {
       if(abs(tcrt-thit)<fCoinWindow && hit->PE()>pemax) {
@@ -419,7 +420,8 @@ void icarus::crt::CRTPMTMatchingAna::analyze(art::Event const& e)
 	xyzt.push_back(thit);
 
 	matched = true;
-	std::cout << "thit: "<<thit << " , tcrt: " << tcrt << " , tdiff " << tdiff  << std::endl;
+	std::cout << "Hit matched! tcrt: " << tcrt << ", thit: " << thit << ", tdiff: " << tdiff << "\n";
+	//std::cout << "thit: "<<thit << " , tcrt: " << tcrt << " , tdiff " << tdiff  << std::endl;
       }//if min tof
     }//for OpHits
     if(!matched) {

icaruscode/CRT/CRTUtils/CRTHitRecoAlg.cc

@@ -125,7 +125,7 @@ vector<pair<sbn::crt::CRTHit, vector<int>>> CRTHitRecoAlg::CreateCRTHits(vector<
     if (!CRTReset.empty()) GlobalTrigger = GetMode(CRTReset);
     //Add average difference between trigger_timestamp and Global trigger
     else GlobalTrigger=GlobalTrigger-trigger_offset;// In this event, the T1 Reset was probably "vetoed" by the T0 Reset
-    for (int i=0; i<304; i++){
+    for (int i=0; i<305; i++){
 	if (TriggerArray[i]==0) TriggerArray[i]=GlobalTrigger;
     }
     //std::cout<<"Global Trigger "<<GlobalTrigger<<std::endl;

icaruscode/Decode/CMakeLists.txt

@@ -47,6 +47,8 @@ simple_plugin(DaqDecoderICARUSPMT module
   sbnobj_Common_Trigger
   icaruscode_Decode_DecoderTools_Dumpers
   icaruscode_Decode_DecoderTools
+  icaruscode_Timing
+  icaruscode_Timing_DataProducts
   sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays_Common
   sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays
   lardataobj_RawData

icaruscode/Decode/ChannelMapping/ChannelMapPostGres_tool.cc

@@ -381,11 +381,18 @@ int ChannelMapPostGres::BuildFragmentToDigitizerChannelMap(FragmentToDigitizerCh
             // Now recover the digitizer channel number
             unsigned int digitizerChannelNo = getLongValue(tuple, 9, &error);
             if (error) throw std::runtime_error("Encountered error when trying to recover the PMT digitizer channel number");
-            // Finally, get the LArsoft channel ID
+            // Get the LArsoft channel ID
             unsigned int channelID = getLongValue(tuple, 17, &error);
             if (error) throw std::runtime_error("Encountered error when trying to recover the PMT channel ID");
+            // Get the laserChannelNumber 
+            char laserChannelBuffer[10];
+            getStringValue(tuple, 7, laserChannelBuffer, sizeof(laserChannelBuffer), &error);
+            if (error) throw std::runtime_error("Encountered error when trying to recover the PMT laser channel label");
+            std::string laserChannelLabel(laserChannelBuffer, 2, sizeof(laserChannelBuffer)); //sizeof(digitizerBuffer));
+            unsigned int laserChannel = std::stol(laserChannelLabel);  // try-catch syntax for stol or not necessary ? 
+
             // Fill the map
-            fragmentToDigitizerChannelMap[fragmentID].emplace_back(digitizerChannelNo,channelID);
+            fragmentToDigitizerChannelMap[fragmentID].emplace_back(digitizerChannelNo,channelID,laserChannel);
             releaseTuple(tuple);
         }
     }

icaruscode/Decode/ChannelMapping/ChannelMapSQLite_tool.cc

@@ -383,8 +383,13 @@ int buildTPCFragmentIDToReadoutIDMap_callback(void* dataIn, int argc, char**argv
     unsigned int digitizerChannelNo = std::stol(argv[9]);
     unsigned int channelID          = std::stol(argv[17]);
 
+    // Read the laser channel 
+    std::string laserChannelLabel  = argv[7]; // format is L-<number> . <number> is int from [1-41]
+    unsigned int laserChannel      = std::stol(laserChannelLabel.substr(2,4));  // try-catch syntax for stol or not necessary ? 
+
+
     // Fill the map
-    fragmentToDigitizerChannelMap[fragmentID].emplace_back(digitizerChannelNo,channelID);
+    fragmentToDigitizerChannelMap[fragmentID].emplace_back(digitizerChannelNo,channelID,laserChannel);
 
     return 0;
   }

icaruscode/Decode/ChannelMapping/IChannelMapping.h

@@ -56,7 +56,7 @@ namespace icarusDB
      *         and the related crate and readout information. 
      *         Then define the function interface to fill these data structures 
      */
-    using DigitizerChannelChannelIDPair    = std::pair<size_t,size_t>;
+    using DigitizerChannelChannelIDPair    = std::tuple<size_t,size_t,size_t>; // std::tuple<DigitizerChannel, ChannelID, LaserChannel>
     using DigitizerChannelChannelIDPairVec = std::vector<DigitizerChannelChannelIDPair>;
     using FragmentToDigitizerChannelMap    = std::map<size_t, DigitizerChannelChannelIDPairVec>;
 

icaruscode/Decode/ChannelMapping/IICARUSChannelMap.h

@@ -23,7 +23,7 @@ using ReadoutIDVec                     = std::vector<unsigned int>;
 using ChannelPlanePair                 = std::pair<unsigned int, unsigned int>;
 using ChannelPlanePairVec              = std::vector<ChannelPlanePair>;
 
-using DigitizerChannelChannelIDPair    = std::pair<size_t,size_t>;
+using DigitizerChannelChannelIDPair    = std::tuple<size_t,size_t, size_t>;
 using DigitizerChannelChannelIDPairVec = std::vector<DigitizerChannelChannelIDPair>;
 
 using ChannelPlanePair                 = std::pair<unsigned int, unsigned int>;

icaruscode/Decode/ChannelMapping/PMTChannelMapDumper.cxx

@@ -102,12 +102,12 @@ int main(int argc, char** argv) {
     log
       << "[" << iFragment << "] " << std::hex << fragmentID << std::dec
       << " includes " << digitizerChannels.size()
-      << " LArSoft channels between " << digitizerChannels.front().second
-      << " and " << digitizerChannels.back().second
+      << " LArSoft channels between " << std::get<1U>( digitizerChannels.front() )
+      << " and " << std::get<1U>( digitizerChannels.back() )
       << " [board channel index in brackets]:";
     constexpr unsigned int Cols = 8U;
     unsigned int n = 0;
-    for(auto const [ digitizerChannel, channelID ]: digitizerChannels) {
+    for(auto const [ digitizerChannel, channelID, laserChannel ]: digitizerChannels) {
       if (n-- == 0) { log << "\n     "; n = Cols - 1U; }
       log << " "  << std::setw(3) << channelID
         << " [" << std::setw(3) << digitizerChannel << "]";