Skip to content
Snippets Groups Projects

LArConditionsCommon_comm_jobOptions: Remove LArFlatConditionsSvc (now all done by cond-algos)

Merged Walter Lampl requested to merge wlampl/athena:noLArFlatCondSvc into master
1 file
+ 0
28
Compare changes
  • Side-by-side
  • Inline
@@ -82,17 +82,6 @@ if not larCondFlags.LoadElecCalib.is_locked():
haveElecCalibInline=(conddb.dbdata=="CONDBR2")
if (haveElecCalibInline):
# TEMPORARY --- until everything's been changed to use conditions handles.
# Run 2 case:
#This service creates a objects in the DetectorStore that wrap the AttributeListCollections
#with the inline representation of the electronic calibration and makes them accessible through the
#ILArRamp, ILArOFC, etc. abstract interfaces
from LArRecUtils.LArRecUtilsConf import LArFlatConditionSvc
theLArCondSvc=LArFlatConditionSvc()
svcMgr+=theLArCondSvc
svcMgr.ProxyProviderSvc.ProviderNames += [ "LArFlatConditionSvc" ]
def addLArFlatFolder (db, obj, calg, qual=''):
from AthenaCommon.AlgSequence import AthSequencer
@@ -119,8 +108,6 @@ def addLArFolder (db, obj, cls, qual=''):
if (haveElecCalibInline):
from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArHVScaleCorrFlat_ as LArHVScaleCorrCondFlatAlg
addLArFlatFolder (ONLDB, 'HVScaleCorr', LArHVScaleCorrCondFlatAlg, sqlDB)
# TEMPORARY
theLArCondSvc.HVScaleCorrInput="/LAR/ElecCalibFlat/HVScaleCorr"
else:
# In Run-1 it's used also, an ESD2AOD is not covered so far, so adding it here
if rec.readESD():
@@ -149,9 +136,6 @@ if larCondFlags.LoadElecCalib():
if larCondFlags.ua2MeVFolder()=="":
from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LAruA2MeVFlat_ as LAruA2MeVCondAlg
addLArFlatFolder ('LAR_ONL', 'uA2MeV', LAruA2MeVCondAlg)
# TEMPORARY
theLArCondSvc.uA2MeVInput="/LAR/ElecCalibFlat/uA2MeV"
else:
#Load from offline database
addLArFolder ('LAR_OFL', larCondFlags.ua2MeVFolder(),
@@ -160,28 +144,20 @@ if larCondFlags.LoadElecCalib():
#2. DAC2uA
from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArDAC2uAFlat_ as LArDAC2uACondAlg
addLArFlatFolder ('LAR_ONL', 'DAC2uA', LArDAC2uACondAlg)
# TEMPORARY
theLArCondSvc.DAC2uAInput="/LAR/ElecCalibFlat/DAC2uA"
#3. Pedestal
from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArPedestalFlat_ as LArPedestalCondAlg
addLArFlatFolder (ONLDB, 'Pedestal', LArPedestalCondAlg, sqlDB)
# TEMPORARY
theLArCondSvc.PedestalInput="/LAR/ElecCalibFlat/Pedestal"
#4. Ramp
from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArRampFlat_ as LArRampCondAlg
addLArFlatFolder (ONLDB, 'Ramp', LArRampCondAlg, sqlDB)
# TEMPORARY
theLArCondSvc.RampInput="/LAR/ElecCalibFlat/Ramp"
#5. MphysOverMcal
if larCondFlags.MphysOverMcalFolder()=="":
from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArMphysOverMcalFlat_ as LArMphysOverMcalCondAlg
addLArFlatFolder (ONLDB, 'MphysOverMcal',
LArMphysOverMcalCondAlg, sqlDB)
# TEMPORARY
theLArCondSvc.MphysOverMcalInput="/LAR/ElecCalibFlat/MphysOverMcal"
else:
#Load from offline database:
@@ -194,8 +170,6 @@ if larCondFlags.LoadElecCalib():
if larCondFlags.OFCShapeFolder()=="":
from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArOFCFlat_ as LArOFCCondAlg
addLArFlatFolder (ONLDB, 'OFC', LArOFCCondAlg, sqlDB)
# TEMPORARY
theLArCondSvc.OFCInput="/LAR/ElecCalibFlat/OFC"
else:
#Load from offline DB
if 'RekeyOFC' in dir():
@@ -212,8 +186,6 @@ if larCondFlags.LoadElecCalib():
if larCondFlags.OFCShapeFolder()=="":
from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArShapeFlat_ as LArShapeCondAlg
addLArFlatFolder (ONLDB, 'Shape', LArShapeCondAlg, sqlDB)
# TEMPORARY
theLArCondSvc.ShapeInput="/LAR/ElecCalibFlat/Shape"
else:
#Load from offline database
if 'RekeyShape' in dir():
Loading