Merge branch 'TestBCID.20190405' into '21.3'

Using wrong pileup average folder for BCID dependend offset correction

See merge request atlas/athena!22627

(cherry picked from commit fb830731)

474f0cec Using wrong pileup average folder for BCID dependend offset correction

Calorimeter/CaloTools/python/CaloLumiBCIDSCToolDefault.py

@@ -23,7 +23,7 @@ def CaloLumiBCIDSCToolDefault(name='CaloLumiBCIDSCToolDefault'):
       from IOVDbSvc.CondDB import conddb
       conddb.addFolder("LAR_OFL","/LAR/ElecCalibMCSC/Shape")
       conddb.addFolder("LAR_OFL","/LAR/ElecCalibMCSC/MinBias")
-      conddb.addFolder("LAR_OFL","/LAR/ElecCalibMCSC/MinBiasAverage<tag>LARElecCalibMCSCMinBiasAverage-000</tag>")
+      conddb.addFolder("LAR_OFL","/LAR/ElecCalibMCSC/LArPileupAverage<tag>LARElecCalibMCSCLArPileupAverage-IOVDEP-00</tag>")
       theTool = CaloLumiBCIDTool(name,
                       isMC=True,
                       isSC=True,

LArCalorimeter/LArRecUtils/src/LArFlatConditionSvc.cxx

@@ -138,7 +138,7 @@ LArFlatConditionSvc::LArFlatConditionSvc( const std::string& name, ISvcLocator*
   declareProperty("RampSCInput",        m_objInfo[14].m_inputKey="/LAR/ElecCalibMCSC/Ramp");	     
   declareProperty("ShapeSCInput",       m_objInfo[15].m_inputKey="/LAR/ElecCalibMCSC/Shape");	     
   declareProperty("MinBiasSCInput",     m_objInfo[16].m_inputKey="/LAR/ElecCalibMCSC/MinBias");	     
-  declareProperty("MinBiasAverageSCInput",     m_objInfo[17].m_inputKey="/LAR/ElecCalibMCSC/MinBiasAverage");	     
+  declareProperty("MinBiasAverageSCInput",     m_objInfo[17].m_inputKey="/LAR/ElecCalibMCSC/LArPileupAverage");	     
 
   declareProperty("DoSuperCells", m_doSuperCells);
   declareProperty("DoRegularCells", m_doRegularCells);