Fixed calo v2

offline/QA/Calorimeters/CaloValid.cc

@@ -335,13 +335,16 @@ int CaloValid::process_towers(PHCompositeNode* topNode)
           status = status >> 1U;  // clang-tidy mark 1 as unsigned
         }
 
-        totalcemc += offlineenergy;
+        if (isGood)
+        {
+          totalcemc += offlineenergy;
+        }
         h_emcaltime->Fill(_timef);
         if (offlineenergy > emcal_hit_threshold)
         {
           h_cemc_etaphi_time->Fill(ieta, iphi, _timef);
           h_cemc_etaphi->Fill(ieta, iphi);
-          if (isGood && (scaledBits[10] || scaledBits[11]))
+          if (isGood && (scaledBits[10] || scaledBits[12]))
           {
             h_cemc_etaphi_wQA->Fill(ieta, iphi, offlineenergy);
           }
@@ -407,14 +410,17 @@ int CaloValid::process_towers(PHCompositeNode* topNode)
           status = status >> 1U;  // clang-tidy mark 1 as unsigned
         }
 
-        totalihcal += offlineenergy;
+        if (isGood)
+        {
+          totalihcal += offlineenergy;
+        }
         h_ihcaltime->Fill(_timef);
 
         if (offlineenergy > ihcal_hit_threshold)
         {
           h_ihcal_etaphi->Fill(ieta, iphi);
           h_ihcal_etaphi_time->Fill(ieta, iphi, _timef);
-          if (isGood && (scaledBits[10] || scaledBits[11]))
+          if (isGood && (scaledBits[10] || scaledBits[12]))
           {
             h_ihcal_etaphi_wQA->Fill(ieta, iphi, offlineenergy);
           }
@@ -472,14 +478,17 @@ int CaloValid::process_towers(PHCompositeNode* topNode)
           status = status >> 1U;  // clang-tidy mark 1 as unsigned
         }
 
-        totalohcal += offlineenergy;
+        if (isGood)
+        {
+          totalohcal += offlineenergy;
+        }
         h_ohcaltime->Fill(_timef);
 
         if (offlineenergy > ohcal_hit_threshold)
         {
           h_ohcal_etaphi_time->Fill(ieta, iphi, _timef);
           h_ohcal_etaphi->Fill(ieta, iphi);
-          if (isGood && (scaledBits[10] || scaledBits[11]))
+          if (isGood && (scaledBits[10] || scaledBits[12]))
           {
             h_ohcal_etaphi_wQA->Fill(ieta, iphi, offlineenergy);
           }

offline/QA/Calorimeters/CaloValid.h

@@ -55,7 +55,7 @@ class CaloValid : public SubsysReco
 
   TriggerAnalyzer* trigAna{nullptr};
   TH3* h_pi0_trigIB_mass{nullptr};
-  std::vector<int> triggerIndices{10, 28, 29, 30, 31};  // MBD NS>=1, Photon Triggers
+  std::vector<int> triggerIndices{10, 12, 28, 29, 30, 31};  // MBD NS>=1, Photon Triggers
 
   TH1* h_cemc_channel_pedestal[128 * 192]{nullptr};
   TH1* h_ihcal_channel_pedestal[32 * 48]{nullptr};

offline/QA/Tracking/MicromegasClusterQA.cc

@@ -73,6 +73,9 @@ int MicromegasClusterQA::InitRun(PHCompositeNode* topNode)
       << (m_calibration_filename.empty() ? "unspecified" : m_calibration_filename)
       << std::endl;
 
+  std::cout << "MicromegasClusterQA::InitRun - m_sample_min: " << m_sample_min << std::endl;
+  std::cout << "MicromegasClusterQA::InitRun - m_sample_max: " << m_sample_max << std::endl;
+
   // read calibrations
   if (!m_calibration_filename.empty())
   {
@@ -162,6 +165,13 @@ int MicromegasClusterQA::process_event(PHCompositeNode* topNode)
       // find associated hits
       const auto hit_range = m_cluster_hit_map->getHits(ckey);
 
+      // check hit samples
+      // if none of the associated hits' sample is within acceptable range, skip the cluster
+      if( std::none_of( hit_range.first, hit_range.second,
+        [this]( const TrkrClusterHitAssoc::Map::value_type& pair )
+        { return MicromegasDefs::getSample( pair.second ) >= m_sample_min &&  MicromegasDefs::getSample( pair.second ) < m_sample_max; } ) )
+      { continue; }
+
       // store cluster size and fill cluster size histogram
       const int cluster_size = std::distance(hit_range.first, hit_range.second);
       m_h_cluster_size->Fill(detid, cluster_size);

offline/QA/Tracking/MicromegasClusterQA.h

@@ -51,6 +51,13 @@ class MicromegasClusterQA : public SubsysReco
     m_calibration_filename = value;
   }
 
+  /// set min sample for signal hits
+  void set_sample_min(uint16_t value) { m_sample_min = value; }
+
+  /// set max sample for signal hits
+  void set_sample_max(uint16_t value) { m_sample_max = value; }
+
+
  private:
   void create_histograms();
 
@@ -98,6 +105,12 @@ class MicromegasClusterQA : public SubsysReco
   /// keep track of detector names
   std::vector<std::string> m_detector_names;
 
+  /// min sample for signal
+  uint16_t m_sample_min = 0;
+
+  /// max sample for signal
+  uint16_t m_sample_max = 1024;
+
   ///@name calibration filename
   //@{
 

offline/framework/fun4allraw/Fun4AllStreamingInputManager.cc

@@ -776,9 +776,15 @@ int Fun4AllStreamingInputManager::FillIntt()
   {
     h_taggedAllFee_intt->Fill(refbcobitshift);
   }
-  while (m_InttRawHitMap.begin()->first <= select_crossings - m_intt_negative_bco)
+
+  for (auto& [bco, hitinfo] : m_InttRawHitMap)
   {
-    for (auto *intthititer : m_InttRawHitMap.begin()->second.InttRawHitVector)
+    if (bco > select_crossings)
+    {
+      break;
+    }
+
+    for (auto *intthititer : hitinfo.InttRawHitVector)
     {
       if (Verbosity() > 1)
       {
@@ -788,25 +794,9 @@ int Fun4AllStreamingInputManager::FillIntt()
       }
       inttcont->AddHit(intthititer);
     }
-    for (auto *iter : m_InttInputVector)
-    {
-      iter->CleanupUsedPackets(m_InttRawHitMap.begin()->first);
-      if (m_intt_negative_bco < 2)  // triggered mode
-      {
-        iter->clearPacketBClkStackMap(m_InttRawHitMap.begin()->first);
-        iter->clearFeeGTML1BCOMap(m_InttRawHitMap.begin()->first);
-      }
-    }
-    m_InttRawHitMap.begin()->second.InttRawHitVector.clear();
-    m_InttRawHitMap.erase(m_InttRawHitMap.begin());
-    if (m_InttRawHitMap.empty())
-    {
-      break;
-    }
-  }
+  } 
   return 0;
 }
-
 int Fun4AllStreamingInputManager::FillMvtx()
 {
   int iret = FillMvtxPool();
@@ -846,7 +836,7 @@ int Fun4AllStreamingInputManager::FillMvtx()
   }
   select_crossings += m_RefBCO;
 
-  uint64_t ref_bco_minus_range = m_RefBCO < m_mvtx_bco_range ? 0 : m_RefBCO - m_mvtx_bco_range;
+  uint64_t ref_bco_minus_range = m_RefBCO < m_mvtx_negative_bco ? 0 : m_RefBCO - m_mvtx_negative_bco;
   if (Verbosity() > 2)
   {
     std::cout << "select MVTX crossings"
@@ -981,90 +971,42 @@ int Fun4AllStreamingInputManager::FillMvtx()
   }
   taggedPacketsFEEs.clear();
 
-  if (m_mvtx_is_triggered)
+  uint64_t lower_limit = m_mvtx_is_triggered ? select_crossings : select_crossings - m_mvtx_bco_range - m_mvtx_negative_bco;
+  uint64_t upper_limit = m_mvtx_is_triggered ? select_crossings + m_mvtx_bco_range : select_crossings;
+
+  for (auto& [bco, hitinfo] : m_MvtxRawHitMap)
   {
-    while (select_crossings <= m_MvtxRawHitMap.begin()->first && m_MvtxRawHitMap.begin()->first <= select_crossings + m_mvtx_bco_range)  // triggered
+    if (bco < lower_limit)
     {
-      if (Verbosity() > 2)
-      {
-        std::cout << "Adding 0x" << std::hex << m_MvtxRawHitMap.begin()->first
-                  << " ref: 0x" << select_crossings << std::dec << std::endl;
-      }
-      for (auto *mvtxFeeIdInfo : m_MvtxRawHitMap.begin()->second.MvtxFeeIdInfoVector)
-      {
-        if (Verbosity() > 1)
-        {
-          mvtxFeeIdInfo->identify();
-        }
-        mvtxEvtHeader->AddFeeIdInfo(mvtxFeeIdInfo);
-        delete mvtxFeeIdInfo;
-      }
-      m_MvtxRawHitMap.begin()->second.MvtxFeeIdInfoVector.clear();
-      mvtxEvtHeader->AddL1Trg(m_MvtxRawHitMap.begin()->second.MvtxL1TrgBco);
+      continue;
+    }
+    if (bco > upper_limit)
+    {
+      break;
+    }
 
-      for (auto *mvtxhititer : m_MvtxRawHitMap.begin()->second.MvtxRawHitVector)
-      {
-        if (Verbosity() > 1)
-        {
-          mvtxhititer->identify();
-        }
-        mvtxcont->AddHit(mvtxhititer);
-      }
-      for (auto *iter : m_MvtxInputVector)
-      {
-        iter->CleanupUsedPackets(m_MvtxRawHitMap.begin()->first);
-      }
-      m_MvtxRawHitMap.begin()->second.MvtxRawHitVector.clear();
-      m_MvtxRawHitMap.begin()->second.MvtxL1TrgBco.clear();
-      m_MvtxRawHitMap.erase(m_MvtxRawHitMap.begin());
-      // m_MvtxRawHitMap.empty() need to be checked here since we do not call FillPoolMvtx()
-      if (m_MvtxRawHitMap.empty())
-      {
-        break;
-      }
+    if (Verbosity() > 2)
+    {
+      std::cout << "Adding 0x" << std::hex << bco 
+                << " ref: 0x" << select_crossings << std::dec << std::endl;
     }
-  }
-  else
-  {
-    while (select_crossings - m_mvtx_bco_range - m_mvtx_negative_bco <= m_MvtxRawHitMap.begin()->first && m_MvtxRawHitMap.begin()->first <= select_crossings)  // streamed
+    for (auto *mvtxFeeIdInfo : hitinfo.MvtxFeeIdInfoVector)
     {
-      if (Verbosity() > 2)
-      {
-        std::cout << "Adding 0x" << std::hex << m_MvtxRawHitMap.begin()->first
-                  << " ref: 0x" << select_crossings << std::dec << std::endl;
-      }
-      for (auto *mvtxFeeIdInfo : m_MvtxRawHitMap.begin()->second.MvtxFeeIdInfoVector)
+      if (Verbosity() > 1)
       {
-        if (Verbosity() > 1)
-        {
-          mvtxFeeIdInfo->identify();
-        }
-        mvtxEvtHeader->AddFeeIdInfo(mvtxFeeIdInfo);
-        delete mvtxFeeIdInfo;
+        mvtxFeeIdInfo->identify();
       }
-      m_MvtxRawHitMap.begin()->second.MvtxFeeIdInfoVector.clear();
-      mvtxEvtHeader->AddL1Trg(m_MvtxRawHitMap.begin()->second.MvtxL1TrgBco);
+      mvtxEvtHeader->AddFeeIdInfo(mvtxFeeIdInfo);
+    }
+    mvtxEvtHeader->AddL1Trg(hitinfo.MvtxL1TrgBco);
 
-      for (auto *mvtxhititer : m_MvtxRawHitMap.begin()->second.MvtxRawHitVector)
-      {
-        if (Verbosity() > 1)
-        {
-          mvtxhititer->identify();
-        }
-        mvtxcont->AddHit(mvtxhititer);
-      }
-      for (auto *iter : m_MvtxInputVector)
-      {
-        iter->CleanupUsedPackets(m_MvtxRawHitMap.begin()->first);
-      }
-      m_MvtxRawHitMap.begin()->second.MvtxRawHitVector.clear();
-      m_MvtxRawHitMap.begin()->second.MvtxL1TrgBco.clear();
-      m_MvtxRawHitMap.erase(m_MvtxRawHitMap.begin());
-      // m_MvtxRawHitMap.empty() need to be checked here since we do not call FillPoolMvtx()
-      if (m_MvtxRawHitMap.empty())
+    for (auto *mvtxhititer : hitinfo.MvtxRawHitVector)
+    {
+      if (Verbosity() > 1)
       {
-        break;
+        mvtxhititer->identify();
       }
+      mvtxcont->AddHit(mvtxhititer);
     }
   }
 
@@ -1422,7 +1364,7 @@ int Fun4AllStreamingInputManager::FillMicromegasPool()
 
 int Fun4AllStreamingInputManager::FillMvtxPool()
 {
-  uint64_t ref_bco_minus_range = m_RefBCO < m_mvtx_bco_range ? m_mvtx_bco_range : m_RefBCO - m_mvtx_bco_range;
+  uint64_t ref_bco_minus_range = m_RefBCO < m_mvtx_negative_bco ? m_mvtx_negative_bco : m_RefBCO - m_mvtx_negative_bco;
   for (auto *iter : m_MvtxInputVector)
   {
     if (Verbosity() > 3)

offline/framework/fun4allraw/SingleMicromegasPoolInput_v2.cc

@@ -607,6 +607,7 @@ void SingleMicromegasPoolInput_v2::createQAHistos()
     m_evaluation_file.reset(new TFile(m_evaluation_filename.c_str(), "RECREATE"));
     m_evaluation_tree = new TTree("T", "T");
     m_evaluation_tree->Branch("is_heartbeat", &m_waveform.is_heartbeat);
+    m_evaluation_tree->Branch("matched", &m_waveform.matched);
     m_evaluation_tree->Branch("packet_id", &m_waveform.packet_id);
     m_evaluation_tree->Branch("fee_id", &m_waveform.fee_id);
     m_evaluation_tree->Branch("channel", &m_waveform.channel);
@@ -912,6 +913,13 @@ void SingleMicromegasPoolInput_v2::process_fee_data(int packet_id, unsigned int
 
     // try get gtm bco matching fee
     const auto& fee_bco = payload.bx_timestamp;
+    if( m_do_evaluation )
+    {
+      m_waveform.is_heartbeat = is_heartbeat;
+      m_waveform.fee_id = fee_id;
+      m_waveform.channel = payload.channel;
+      m_waveform.fee_bco = fee_bco;
+    }
 
     // find matching gtm bco
     uint64_t gtm_bco = 0;
@@ -920,9 +928,20 @@ void SingleMicromegasPoolInput_v2::process_fee_data(int packet_id, unsigned int
     {
       // assign gtm bco
       gtm_bco = result.value();
-    }
-    else
-    {
+      if( m_do_evaluation )
+      {
+        m_waveform.matched = true;
+        m_waveform.gtm_bco_matched = gtm_bco;
+        {
+          const auto predicted = bco_matching_information.get_predicted_fee_bco(gtm_bco);;
+          if( predicted )
+          {
+            m_waveform.fee_bco_predicted_matched = predicted.value();
+          }
+        }
+        m_evaluation_tree->Fill();
+      }
+    } else {
       // increment counter and histogram
       ++m_waveform_counters[packet_id].dropped_bco;
       ++m_fee_waveform_counters[fee_id].dropped_bco;
@@ -935,28 +954,16 @@ void SingleMicromegasPoolInput_v2::process_fee_data(int packet_id, unsigned int
         ++m_fee_heartbeat_counters[fee_id].dropped_bco;
       }
 
-      // skip the waverform
-      continue;
-    }
-
-    if (m_do_evaluation)
-    {
-      m_waveform.is_heartbeat = (payload.type == HEARTBEAT_T);
-      m_waveform.fee_id = fee_id;
-      m_waveform.channel = payload.channel;
-      m_waveform.fee_bco = fee_bco;
-
-      m_waveform.gtm_bco_matched = gtm_bco;
+      if( m_do_evaluation )
       {
-        const auto predicted = bco_matching_information.get_predicted_fee_bco(gtm_bco);
-        ;
-        if (predicted)
-        {
-          m_waveform.fee_bco_predicted_matched = predicted.value();
-        }
+        m_waveform.matched = false;
+        m_waveform.gtm_bco_matched = 0;
+        m_waveform.fee_bco_predicted_matched = 0;
+        m_evaluation_tree->Fill();
       }
 
-      m_evaluation_tree->Fill();
+      // skip the waverform
+      continue;
     }
 
     // ignore heartbeat waveforms

offline/framework/fun4allraw/SingleMicromegasPoolInput_v2.h

@@ -230,6 +230,9 @@ class SingleMicromegasPoolInput_v2 : public SingleStreamingInput
     /// true if measurement is hearbeat
     bool is_heartbeat = false;
 
+    /// true if matched
+    bool matched = false;
+
     /// ll1 bco
     uint64_t gtm_bco_first {0};