fixes

LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py

@@ -410,7 +410,7 @@ if __name__=='__main__':
     cfg.merge(affregmon)
 
     ConfigFlags.dump()
-    f=open("AffectedRegionsMonMaker.pkl","w")
+    f=open("AffectedRegionsMonMaker.pkl","wb")
     cfg.store(f)
     f.close()
 

LArCalorimeter/LArMonitoring/python/LArCalibMonAlg.py

-#
-#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#
-
-def LArCalibMonConfig(inputFlags,gain="",doAccDigit=False,doCalibDigit=False,doAccCalibDigit=False):
-
-    from AthenaMonitoring import AthMonitorCfgHelper
-    helper = AthMonitorCfgHelper(inputFlags,'LArCalibMonCfg')
-
-    from LArMonitoring.GlobalVariables import lArDQGlobals
-
-    from AthenaConfiguration.ComponentFactory import CompFactory
-    larCalibMonAlg = helper.addAlgorithm(CompFactory.LArCalibPedMonAlg,'larCalibMonAlg')
-    if gain != "":
-       if doAccDigit:
-          larCalibMonAlg.LArAccumulatedDigitContainerKey=gain
-       elif doAccCalibDigit:
-          larCalibMonAlg.LArAccumulatedCalibDigitContainerKey=gain
-       elif doCalibDigit:
-          larCalibMonAlg.LArCalibDigitContainerKey=gain
-
-    GroupName="CalibMonGroup"
-
-    larCalibMonAlg.LArPedGroupName=GroupName
-
-    Group = helper.addGroup(
-        larCalibMonAlg,
-        GroupName,
-        '/LAr/'+GroupName+'/'
-    )
-
-
-    #Summary histos
-    summary_hist_path='Summary/'
-    
-
-    Group.defineHistogram('nbChan;NbOfReadoutChannelsGlobal', 
-                                  title='# of readout channels',
-                                  type='TH1I',
-                                  path=summary_hist_path,
-                                  xbins=lArDQGlobals.N_FEB*lArDQGlobals.FEB_N_channels+5, 
-                                  xmin=-0.5, xmax=lArDQGlobals.N_FEB*lArDQGlobals.FEB_N_channels+4.5)
-
-    return helper.result()
-
-    
-
-if __name__=='__main__':
-
-   from AthenaConfiguration.AllConfigFlags import ConfigFlags
-   from AthenaCommon.Logging import log
-   from AthenaCommon.Constants import DEBUG
-   from AthenaCommon.Configurable import Configurable
-   Configurable.configurableRun3Behavior=1
-   log.setLevel(DEBUG)
-
-
-   from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
-   createLArMonConfigFlags()
-
-   ConfigFlags.Input.Files = ["/eos/atlas/atlastier0/rucio/data20_calib/calibration_LArElec-Delay-32s-Medium-Em/00374740/data20_calib.00374740.calibration_LArElec-Delay-32s-Medium-Em.daq.RAW/data20_calib.00374740.calibration_LArElec-Delay-32s-Medium-Em.daq.RAW._lb0000._SFO-2._0001.data"]
-   ConfigFlags.Output.HISTFileName = 'LArCalibMonOutput.root'
-   ConfigFlags.DQ.enableLumiAccess = False
-   ConfigFlags.DQ.useTrigger = False
-   ConfigFlags.Beam.Type = 'collisions'
-   ConfigFlags.DQ.DataType = 'collisions'
-   ConfigFlags.AtlasVersion = 'ATLAS-R2-2016-01-00-01'
-   ConfigFlags.Detector.GeometryCSC=False
-   ConfigFlags.Detector.GeometrysTGC=False
-   ConfigFlags.Detector.GeometryMM=False
-   ConfigFlags.lock()
-
-   from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-   cfg = MainServicesCfg(ConfigFlags)
-
-   from LArByteStream.LArRawCalibDataReadingConfig import LArRawCalibDataReadingCfg
-   cfg.merge(LArRawCalibDataReadingCfg(ConfigFlags,gain="MEDIUM",doAccCalibDigit=True))
-
-   cfg.merge(LArCalibMonConfig(ConfigFlags, gain="MEDIUM",doAccCalibDigit=True))
-
-   cfg.printConfig()
-
-   ConfigFlags.dump()
-   f=open("LArCalibPedMon.pkl","w")
-   cfg.store(f)
-   f.close()
-
-   cfg.run(500,OutputLevel=DEBUG)

LArCalorimeter/LArMonitoring/python/LArCalibPedMonAlg.py

@@ -58,13 +58,14 @@ if __name__=='__main__':
    from LArMonitoring.LArMonConfigFlags import createLArMonConfigFlags
    createLArMonConfigFlags()
 
-   ConfigFlags.Input.Files = ["/eos/atlas/atlastier0/rucio/data20_calib/calibration_LArElec-Pedestal-32s-High-All/00374735/data20_calib.00374735.calibration_LArElec-Pedestal-32s-High-All.daq.RAW/data20_calib.00374735.calibration_LArElec-Pedestal-32s-High-All.daq.RAW._lb0000._SFO-3._0001.data"]
+   ConfigFlags.Input.Files = ["/eos/atlas/atlastier0/rucio/data20_calib/calibration_LArElec-Pedestal-32s-High-All/00384597/data20_calib.00384597.calibration_LArElec-Pedestal-32s-High-All.daq.RAW/data20_calib.00384597.calibration_LArElec-Pedestal-32s-High-All.daq.RAW._lb0000._SFO-2._0001.data"]
    ConfigFlags.Output.HISTFileName = 'LArCalibPedMonOutput.root'
    ConfigFlags.DQ.enableLumiAccess = False
+   ConfigFlags.Input.isMC = False
    ConfigFlags.DQ.useTrigger = False
    ConfigFlags.Beam.Type = 'collisions'
    ConfigFlags.DQ.DataType = 'collisions'
-   ConfigFlags.AtlasVersion = 'ATLAS-R2-2016-01-00-01'
+   ConfigFlags.GeoModel.AtlasVersion = 'ATLAS-R2-2016-01-00-01'
    ConfigFlags.Detector.GeometryCSC=False
    ConfigFlags.Detector.GeometrysTGC=False
    ConfigFlags.Detector.GeometryMM=False
@@ -81,7 +82,7 @@ if __name__=='__main__':
    cfg.printConfig()
 
    ConfigFlags.dump()
-   f=open("LArCalibPedMon.pkl","w")
+   f=open("LArCalibPedMon.pkl","wb")
    cfg.store(f)
    f.close()
 

LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py

@@ -291,7 +291,7 @@ if __name__=='__main__':
     cfg.merge(collmon) 
 
     ConfigFlags.dump()
-    f=open("CollTimeMonMaker.pkl","w")
+    f=open("CollTimeMonMaker.pkl","wb")
     cfg.store(f)
     f.close()
    

LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py

@@ -544,7 +544,7 @@ if __name__=='__main__':
     cfg.merge(larCoverageAcc)
 
     ConfigFlags.dump()
-    f=open("CoverageMaker.pkl","w")
+    f=open("CoverageMaker.pkl","wb")
     cfg.store(f)
     f.close()
 

LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py

@@ -433,4 +433,3 @@ if __name__=='__main__':
    cfg.store(f)
    f.close()
 
-

LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py

@@ -318,7 +318,7 @@ if __name__=='__main__':
     cfg.merge(noisemon) 
 
     ConfigFlags.dump()
-    f=open("NoisyROMonMaker.pkl","w")
+    f=open("NoisyROMonMaker.pkl","wb")
     cfg.store(f)
     f.close()
    

LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py

@@ -264,7 +264,7 @@ if __name__=='__main__':
    cfg.printConfig()
 
    ConfigFlags.dump()
-   f=open("LArRODMon.pkl","w")
+   f=open("LArRODMon.pkl","wb")
    cfg.store(f)
    f.close()
 

LArCalorimeter/LArMonitoring/src/components/LArMonitoring_entries.cxx

@@ -8,6 +8,7 @@
 #include "../LArHVCorrectionMonAlg.h"
 #include "../LArCosmicsMonAlg.h"
 #include "../LArNoiseCorrelationMonAlg.h"
+#include "../LArCalibPedMonAlg.h"
 
 DECLARE_COMPONENT(LArCollisionTimeMonAlg)
 DECLARE_COMPONENT(LArAffectedRegionsAlg)
@@ -19,3 +20,4 @@ DECLARE_COMPONENT(LArNoisyROMonAlg)
 DECLARE_COMPONENT(LArHVCorrectionMonAlg)
 DECLARE_COMPONENT(LArCosmicsMonAlg)
 DECLARE_COMPONENT(LArNoiseCorrelationMonAlg)
+DECLARE_COMPONENT(LArCalibPedMonAlg)