diff --git a/LArCalorimeter/LArCalibTools/share/LArCommConditions2Ntuple.py b/LArCalorimeter/LArCalibTools/share/LArCommConditions2Ntuple.py index 51585f952d2732db8319389cc58a7476b4c57a29..8e15a0ec542d851c0e4138e1e1555b1401b3bf9a 100644 --- a/LArCalorimeter/LArCalibTools/share/LArCommConditions2Ntuple.py +++ b/LArCalorimeter/LArCalibTools/share/LArCommConditions2Ntuple.py @@ -169,7 +169,7 @@ if doObj("AUTOCORR"): conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMC/AutoCorr")) LArAutoCorr2Ntuple.ContainerKey="LArAutoCorr" elif IsFlat: - print 'No Flat Autocorr exists !!!' + print ('No Flat Autocorr exists !!!') import sys; sys.exit(-1) else: conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibOfl/AutoCorrs/AutoCorr")) @@ -298,7 +298,7 @@ if (doObj("MPHYSOVERMCAL")): if IsMC: if SuperCells: conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMCSC/MphysOverMcal")) - print 'Not MPHYSOVERMCAL fo SuperCells yet !!' + print ('Not MPHYSOVERMCAL fo SuperCells yet !!') import sys; sys.exit(-2) else: conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMC/MphysOverMcal")) @@ -318,12 +318,12 @@ if (doObj("MPHYSOVERMCAL")): if (doObj("CALIWAVE")): if IsMC: if SuperCells: - print 'No CALIWAVE for SuperCells yet !!!' + print ('No CALIWAVE for SuperCells yet !!!') import sys; sys.exit(-3) else: conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMC/CaliWave")) elif IsFlat: - print 'No Flat CALIWAVE !!!' + print ('No Flat CALIWAVE !!!') import sys; sys.exit(-3) else: loadCastorCat=True @@ -373,10 +373,10 @@ if (doObj("NOISE")): conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMC/Noise")) elif IsFlat: #conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibFlat/Noise")) - print 'No Flat LArNoise yet !!!' + print ('No Flat LArNoise yet !!!') import sys; sys.exit(-5) else: - print 'For Cell noise use the CaloNoise2Ntuple algo !' + print ('For Cell noise use the CaloNoise2Ntuple algo !') import sys; sys.exit(-5) pass from LArCalibTools.LArCalibToolsConf import LArNoise2Ntuple @@ -395,7 +395,7 @@ if (doObj("FSAMPL")): conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMC/fSampl")) elif IsFlat: #conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibFlat/fSampl")) - print 'No Flat LArfSampl yet !!!' + print ('No Flat LArfSampl yet !!!') import sys; sys.exit(-5) else: conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibOfl/fSampl/Symmetry")) @@ -417,7 +417,7 @@ if doObj("HVSCALE"): conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibFlat/HVScaleCorr")) svcMgr.LArFlatConditionSvc.HVScaleCorrInput="/LAR/ElecCalibFlat/HVScaleCorr" else: - print 'Only Flat HVSCALE !!!' + print ('Only Flat HVSCALE !!!') import sys; sys.exit(-5) @@ -436,7 +436,7 @@ if (doObj("MINBIAS")): conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMC/MinBiasAverage")) elif IsFlat: #conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibFlat/Noise")) - print 'No Flat LArMinBias yet !!!' + print ('No Flat LArMinBias yet !!!') import sys; sys.exit(-5) from LArCalibTools.LArCalibToolsConf import LArMinBias2Ntuple LArMinBias2Ntuple=LArMinBias2Ntuple("LArMinBias2Ntuple") @@ -446,13 +446,13 @@ if (doObj("MINBIAS")): if (doObj("PILEUP")): if IsMC: if SuperCells: - print 'No LArPileup for SC yet !!!' + print ('No LArPileup for SC yet !!!') import sys; sys.exit(-5) else: conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMC/LArPileupAverage")) elif IsFlat: #conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibFlat/Noise")) - print 'No Flat LArPileup yet !!!' + print ('No Flat LArPileup yet !!!') import sys; sys.exit(-5) else: conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibOfl/LArPileupAverage")) diff --git a/LArCalorimeter/LArCalibTools/share/LArMCConditions2Ntuple.py b/LArCalorimeter/LArCalibTools/share/LArMCConditions2Ntuple.py index 1a35ffa4835cfb273b6320e18243c2bfdc57f847..3482170fe58d99ed77cbc8228d985d3d307545e2 100644 --- a/LArCalorimeter/LArCalibTools/share/LArMCConditions2Ntuple.py +++ b/LArCalorimeter/LArCalibTools/share/LArMCConditions2Ntuple.py @@ -154,8 +154,8 @@ if doObj("RAMP"): topSequence+=LArRamps2Ntuple if (doObj("UA2MEV")): - print 'DAC2uA check : ',getDBFolderAndTag("/LAR/ElecCalibMC/DAC2uA") - print 'uA2MeV check : ',getDBFolderAndTag("/LAR/ElecCalibMC/uA2MeV") + print ('DAC2uA check : ',getDBFolderAndTag("/LAR/ElecCalibMC/DAC2uA")) + print ('uA2MeV check : ',getDBFolderAndTag("/LAR/ElecCalibMC/uA2MeV")) conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMC/DAC2uA")) conddb.addFolder("",getDBFolderAndTag("/LAR/ElecCalibMC/uA2MeV")) from LArCalibTools.LArCalibToolsConf import LAruA2MeV2Ntuple diff --git a/LArCalorimeter/LArCalibTools/share/LArPhysWaveFromDB2NTuple_jobOptions.py b/LArCalorimeter/LArCalibTools/share/LArPhysWaveFromDB2NTuple_jobOptions.py index 61353c2f345d83dea3b3d4f64ff7e09476e4743b..9081215093a171ff829c3d20f171597df4045744 100644 --- a/LArCalorimeter/LArCalibTools/share/LArPhysWaveFromDB2NTuple_jobOptions.py +++ b/LArCalorimeter/LArCalibTools/share/LArPhysWaveFromDB2NTuple_jobOptions.py @@ -134,7 +134,7 @@ if not 'LArInputWaveFolder' in dir(): conddb.addFolder("",LArCalib_Flags.LArPhysWaveFolder+"<key>"+LArInputWaveKey+"</key><dbConnection>"+DBConnectionWave+"</dbConnection>"+ChannelSelection) else: InputTagSpecPhysWave = LArCalibFolderTag(LArInputWaveFolder,LArInputWaveTag) - print 'Input tag: ',InputTagSpecPhysWave," in folder: ",LArInputWaveFolder + print ('Input tag: ',InputTagSpecPhysWave," in folder: ",LArInputWaveFolder) conddb.addFolder("",LArInputWaveFolder+"<key>"+LArInputWaveKey+"</key><dbConnection>"+DBConnectionWave+"</dbConnection>"+ChannelSelection) diff --git a/LArCalorimeter/LArCalibTools/share/LArPulseShapeRun.py b/LArCalorimeter/LArCalibTools/share/LArPulseShapeRun.py index ef841ebcfdbabcaec408469898c4253cace327ec..d2fc807e3343bb60880ffe873c1297a0b2456b37 100644 --- a/LArCalorimeter/LArCalibTools/share/LArPulseShapeRun.py +++ b/LArCalorimeter/LArCalibTools/share/LArPulseShapeRun.py @@ -57,7 +57,7 @@ theApp.EvtMax = -1 from RecExConfig.AutoConfiguration import GetProjectName,ConfigureTriggerStream ConfigureTriggerStream() -print rec.triggerStream() +print (rec.triggerStream()) ## TDT @@ -126,5 +126,5 @@ svcMgr.MessageSvc.debugLimit = 5000000 svcMgr.IOVDbSvc.OutputLevel=DEBUG -print theApp +print (theApp) diff --git a/LArCalorimeter/LArCalibTools/share/LArReadParamsFromFile_P3C_jobOptions.py b/LArCalorimeter/LArCalibTools/share/LArReadParamsFromFile_P3C_jobOptions.py index 40140cf87e04e130c7a425f183652467003c32fd..45af92352d7719b7883deee22cc83514958b2c57 100644 --- a/LArCalorimeter/LArCalibTools/share/LArReadParamsFromFile_P3C_jobOptions.py +++ b/LArCalorimeter/LArCalibTools/share/LArReadParamsFromFile_P3C_jobOptions.py @@ -115,9 +115,9 @@ if not 'OutputDB' in dir(): OutputDB = "sqlite://;schema=myDB200.db;dbname=COMP200" if 'OutputSQLiteFile' in dir(): - print 'OutputSQLiteFile',OutputSQLiteFile + print ('OutputSQLiteFile',OutputSQLiteFile ) OutputDB = DBConnectionFile(OutputSQLiteFile) - print 'OutputDB',OutputDB + print ('OutputDB',OutputDB ) if not 'ParamsFolderName' in dir(): ParamsFolderName = "/LAR/ElecCalib/DetCellParams" diff --git a/LArCalorimeter/LArCalibTools/src/LArAutoCorr2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArAutoCorr2Ntuple.cxx index 0ebd94c29c076c2ac9ac0be30a1e92648525aa5f..2c1dcab2a024c031782ea5bc763631f656dc7ff2 100755 --- a/LArCalorimeter/LArCalibTools/src/LArAutoCorr2Ntuple.cxx +++ b/LArCalorimeter/LArCalibTools/src/LArAutoCorr2Ntuple.cxx @@ -11,7 +11,6 @@ LArAutoCorr2Ntuple::LArAutoCorr2Ntuple(const std::string& name, ISvcLocator* pSvcLocator) : LArCond2NtupleBase(name, pSvcLocator) { - declareProperty("ContainerKey",m_objKey); declareProperty("Nsamples", m_nsamples=32); m_ntTitle="AutoCorrelation";