Merge branch '21.0-SCTCalib2017' into '21.0'

21.0 sct calib2017

See merge request !4948

Former-commit-id: 75e26588baec26a5c54c209873f4425a6e446f0f

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h

@@ -388,6 +388,9 @@ class SCTCalib : public AthAlgorithm {
         std::string
         getStripList( const std::set<Identifier>& stripIdList ) const;
 
+        std::set<Identifier>
+        getOverlapStripList( const std::set<Identifier>& stripAllIdList, const std::set<Identifier>& stripRefIdList ) const;
+
         StatusCode
         noisyStripsToXml( const std::map< Identifier, std::set<Identifier> >& moduleList, const std::string& badStripsFile ) const;
 

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/python/runSelector.py

@@ -168,7 +168,7 @@ def main( runNum = None, procType = None, forceSkipQueue = 0, Stream = None ):
                 if 'Project tag:' in line and runPro=='':
                     runPro = line.split('\'')[1]
                 if runNum!='' and runPro!='':
-                    if 'data17_cos' in runPro or 'data17_13TeV' in runPro or 'data17_hi' in runPro:
+                    if 'data17_cos' in runPro or 'data17_13TeV' in runPro or 'data17_5TeV' in runPro or 'data17_900GeV' in runPro or 'data17_hi' in runPro:
                         runList.append(runNum)
                         runDict[runNum] = runPro
                     runNum=''

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.cxx

@@ -121,7 +121,7 @@ SCT_CalibEventInfo::handle(const Incident &inc){
       EventInfo* eventInfo = const_cast<EventInfo*>( m_evt );
       eventInfo->event_ID()->set_run_number( m_runNumber );
       eventInfo->event_ID()->set_time_stamp( m_timeStampBegin );
-      msg( MSG::DEBUG ) << SCT_CalibAlgs::eventInfoAsString(m_evt)<<endreq;
+      msg( MSG::INFO ) << SCT_CalibAlgs::eventInfoAsString(m_evt)<<endreq;
   } else msg( MSG::FATAL ) << "SCT_CalibEventInfo: Unknown source!" << endreq;
 }