added lumiBlock to SCT_CalibHistoTool for creation of LB dependent HitMaps

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/ISCT_CalibHistoTool.h

@@ -54,6 +54,8 @@ class ISCT_CalibHistoTool: virtual public IAlgTool {
       int numberOfLb() const;
       /// set number of lumiblocks
       void setLbToMerge(const int nLbMerge);
+      /// set lumiblock for Lb dependent maps
+      void setLb(const int nLb);
       /// get number of lumiblocks
       int LbToMerge() const;
    protected:
@@ -62,6 +64,7 @@ class ISCT_CalibHistoTool: virtual public IAlgTool {
       TH1I* m_numberOfEventsHisto{nullptr};
       ITHistSvc* m_thistSvc{nullptr};
       const SCT_ID* m_pSCTHelper{nullptr};
+      int m_lumiBlock{0};
       int m_nLb{0};
       int m_nLbMerge{0};
       //

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalibConfig.py

@@ -37,11 +37,11 @@ ReadBS         = True
 # - Set only one flag to True and others to False
 #------------------------------------------------------------
 #--- Algs using TrkVal or BS
-DoNoisyStrip     = False
+DoNoisyStrip     = True
 DoNoisyLB        = False 
 DoHV             = False
 DoDeadStrip      = False
-DoDeadChip       = True
+DoDeadChip       = False
 #--- Algs using HIST
 DoNoiseOccupancy = False 
 DoRawOccupancy   = False

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py

@@ -610,7 +610,7 @@ SCTCalib.EfficiencySummaryFile     = prefix + 'EfficiencySummaryFile.xml'     #
 SCTCalib.BSErrorSummaryFile        = prefix + 'BSErrorSummaryFile.xml'        # Summary of BS Errors
 SCTCalib.BSErrorModuleFile         = prefix + 'BSErrorModuleSummary.xml'      # BS Errors for each module
 
-SCTCalib.OutputLevel     = DEBUG # DEBUG / INFO
+SCTCalib.OutputLevel     = WARNING # DEBUG / INFO
 SCTCalib.AuditAlgorithms = True  # False
 
 print(SCTCalib)
@@ -624,6 +624,6 @@ theApp.EvtMax                      = EvtMax
 #--------------------------------------------------------------
 # Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
 #--------------------------------------------------------------
-ServiceMgr.MessageSvc.OutputLevel = DEBUG
+ServiceMgr.MessageSvc.OutputLevel = WARNING
 ServiceMgr.MessageSvc.debugLimit  = 1000
 ServiceMgr.MessageSvc.infoLimit   = 2000000

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/ISCT_CalibHistoTool.cxx

@@ -82,6 +82,11 @@ ISCT_CalibHistoTool::setLbToMerge(const int nLbMerge) {
    m_nLbMerge = nLbMerge;
 }
 
+void
+ISCT_CalibHistoTool::setLb(const int nLb) {
+   m_lumiBlock = nLb;
+}
+
 int
 ISCT_CalibHistoTool::LbToMerge() const {
    return m_nLbMerge;

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx

@@ -317,6 +317,9 @@ SCTCalib::notEnoughStatistics(const int required, const int obtained, const std:
 // Execute - on event by event
 //////////////////////////////////////////////////////////////////////////////////
 StatusCode SCTCalib::execute() {
+
+   const bool majorityIsGoodOrUnused{(m_useMajority and m_MajorityConditionsTool->isGood()) or !m_useMajority};
+
    ATH_MSG_DEBUG("----- in execute() ----- ");
    if (m_readBS) {
       ATH_MSG_DEBUG("in execute(): m_eventInfoKey = " << m_eventInfoKey);
@@ -341,14 +344,18 @@ StatusCode SCTCalib::execute() {
       m_calibEvtInfoTool->setLumiBlock(std::min(lumiBlock, lbBeginOld), std::max(lumiBlock, lbEndOld));
       m_calibEvtInfoTool->setLumiBlock(lumiBlock);
       m_calibEvtInfoTool->setTimeStamp(timeStamp);
+      if (m_doNoisyLB and majorityIsGoodOrUnused) {
+         m_calibLbTool->setLb(evt->lumiBlock());
+      }
    }
 
-   const bool majorityIsGoodOrUnused{(m_useMajority and m_MajorityConditionsTool->isGood()) or !m_useMajority};
    //--- Fill histograms for (1) Number of events and (2) Hitmaps
    if (m_doHitMaps and majorityIsGoodOrUnused) m_calibHitmapTool->fill(m_readBS);
 
    //--- Fill histograms for (1) Number of events and (2) Hits as a function of LB
-   if (m_doNoisyLB and majorityIsGoodOrUnused) m_calibLbTool->fill(m_readBS);
+   if (m_doNoisyLB and majorityIsGoodOrUnused) {
+      m_calibLbTool->fill(m_readBS);
+   }
 
    //--- Fill histograms for (1) Number of events and (2) BSErrors
    if (m_doBSErrors) m_calibBsErrTool->fill(m_readBS);

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.cxx

@@ -48,6 +48,7 @@ SCT_CalibLbTool::SCT_CalibLbTool(const std::string& type, const std::string& nam
 
 StatusCode
 SCT_CalibLbTool::initialize() {
+
    ATH_MSG_INFO("Initialize of " << PACKAGE_VERSION);
    ATH_CHECK(service("THistSvc", m_thistSvc));
 
@@ -76,7 +77,7 @@ SCT_CalibLbTool::initialize() {
 
    // Read Handle Key
    ATH_CHECK(m_rdoContainerKey.initialize());
-
+   
    return StatusCode::SUCCESS;
 }
 
@@ -223,7 +224,7 @@ SCT_CalibLbTool::fillFromData() {
       ATH_MSG_ERROR("The evtInfo pointer is nullptr");
       return false;
    }
-   m_lumiBlock=m_evtInfo->lumiBlock();
+   //m_lumiBlock=m_evtInfo->lumiBlock();
    m_numberOfEventsHisto->Fill(m_lumiBlock);
    bool result{true};
    //--- Retrieve the RDO container
@@ -251,7 +252,7 @@ SCT_CalibLbTool::fillFromData() {
          int strip{m_pSCTHelper->strip((*rdoItr)->identify())};
          const int endStrip{(*rdoItr)->getGroupSize() + strip};
          for (; strip != endStrip; ++strip) {
-            pThisHisto2D->Fill( strip, m_lumiBlock);
+            pThisHisto2D->Fill( strip, m_lumiBlock );
          }
          ////
          int rdoGroupSize{(*rdoItr)->getGroupSize()};

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h

@@ -53,7 +53,7 @@ class SCT_CalibLbTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
       virtual bool read(const std::string& fileName);
       virtual bool fillFromData();
       //@}
-
+      
    private:
       ToolHandle<ISCT_CalibEvtInfo> m_evtInfo{this, "SCT_CalibEventInfo", "SCT_CalibEventInfo"};
 
@@ -65,8 +65,6 @@ class SCT_CalibLbTool : public extends<AthAlgTool, ISCT_CalibHistoTool>
       VecInt* m_sct_firstStrip{nullptr};
       VecInt* m_sct_rdoGroupSize{nullptr};
 
-      int m_lumiBlock{0};
-
       //private use in this class
       int m_LbRange{0};
       int m_LbsToMerge{0};