Merge pull request #1 from pmandrik/dqm_python3_fix

Dqm python3 fix

DQM/EcalCommon/python/CommonParams_cfi.py

@@ -4,8 +4,8 @@
     onlineMode = cms.untracked.bool(False),
     willConvertToEDM = cms.untracked.bool(True)
 )
-ecaldqmLaserWavelengths = 1, 2, 3
-ecaldqmLedWavelengths = 1, 2
-ecaldqmMGPAGains = 12
-ecaldqmMGPAGainsPN = 16
 
+ecaldqmLaserWavelengths = cms.untracked.vint32(1, 2, 3)
+ecaldqmLedWavelengths = cms.untracked.vint32(1, 2)
+ecaldqmMGPAGains = cms.untracked.vint32(12)
+ecaldqmMGPAGainsPN = cms.untracked.vint32(16)

DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py

@@ -89,7 +89,7 @@
 process.load("DQM.BeamMonitor.BeamSpotProblemMonitor_cff")
 process.load("DQM.BeamMonitor.BeamConditionsMonitor_cff")
 
-if process.dqmRunConfig.type.value() is "production":
+if process.dqmRunConfig.type.value() == "production":
   process.dqmBeamMonitor.BeamFitter.WriteAscii = True
   process.dqmBeamMonitor.BeamFitter.AsciiFileName = '/nfshome0/yumiceva/BeamMonitorDQM/BeamFitResultsOld.txt'
   process.dqmBeamMonitor.BeamFitter.WriteDIPAscii = True

DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py

@@ -99,7 +99,7 @@
 
 # Change Beam Monitor variables
 process.dqmBeamMonitor.useLockRecords = cms.untracked.bool(useLockRecords)
-if process.dqmRunConfig.type.value() is "production":
+if process.dqmRunConfig.type.value() == "production":
   process.dqmBeamMonitor.BeamFitter.WriteAscii = True
   process.dqmBeamMonitor.BeamFitter.AsciiFileName = '/nfshome0/yumiceva/BeamMonitorDQM/BeamFitResults.txt'
   process.dqmBeamMonitor.BeamFitter.WriteDIPAscii = True

DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py

@@ -213,7 +213,7 @@
 #----------------------------
 # File to save beamspot info
 #----------------------------
-if process.dqmRunConfig.type.value() is "production":
+if process.dqmRunConfig.type.value() == "production":
     process.pixelVertexDQM.fileName = "/nfshome0/dqmpro/BeamMonitorDQM/BeamPixelResults.txt"
 else:
     process.pixelVertexDQM.fileName = "/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt"

DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py

@@ -183,7 +183,7 @@
    runkeyVal = runType,
    runkeyName = runTypeName,
    tagQIE11 = "hcalDigis",
-   subsystem = "HcalCalib",
+   subsystem = cms.untracked.string("HcalCalib"),
    laserType = 12
 )
 
@@ -192,7 +192,7 @@
    runkeyVal = runType,
    runkeyName = runTypeName,
    tagQIE11 = "hcalDigis",
-   subsystem = "HcalCalib",
+   subsystem = cms.untracked.string("HcalCalib"),
    eventType = 1
 )
 

DQM/Integration/python/clients/hlt_dqm_clientPB-live_cfg.py

@@ -33,7 +33,7 @@
 #-----------------------------
 
 # customise for playback
-if process.dqmRunConfig.type.value() is "playback":
+if process.dqmRunConfig.type.value() == "playback":
     process.dqmEnv.eventInfoFolder = 'EventInfo/Random'
 
 # DQM Modules

DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py

@@ -112,7 +112,7 @@
 #----------------------
 process.load("DQM.PixelLumi.PixelLumiDQM_cfi") 
 
-if process.dqmRunConfig.type.value() is "playback":
+if process.dqmRunConfig.type.value() == "playback":
     process.pixel_lumi_dqm.logFileName = "pixel_lumi.txt"
 else:
     process.pixel_lumi_dqm.logFileName = "/nfshome0/dqmpro/pixel_lumi.txt"

DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py

@@ -243,7 +243,7 @@
     process.SiStripAnalyserCosmic.TkMapCreationFrequency  = -1
     process.SiStripAnalyserCosmic.ShiftReportFrequency = -1
     process.SiStripAnalyserCosmic.StaticUpdateFrequency = 5
-    process.SiStripAnalyserCosmic.MonitorSiStripBackPlaneCorrection = False
+    process.SiStripAnalyserCosmic.MonitorSiStripBackPlaneCorrection = cms.bool(False)
     process.SiStripClients           = cms.Sequence(process.SiStripAnalyserCosmic)
     ### TRACKING
     process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_Cosmic_cff")
@@ -323,7 +323,7 @@
     process.SiStripAnalyser.ShiftReportFrequency = -1
     process.SiStripAnalyser.StaticUpdateFrequency = 5
     process.SiStripAnalyser.RawDataTag = "rawDataCollector"
-    process.SiStripAnalyser.MonitorSiStripBackPlaneCorrection = False
+    process.SiStripAnalyser.MonitorSiStripBackPlaneCorrection = cms.bool(False)
     process.SiStripClients           = cms.Sequence(process.SiStripAnalyser)
 
     process.SiStripMonitorDigi.TotalNumberOfDigisFailure.integrateNLumisections = 25
@@ -428,7 +428,7 @@
     process.SiStripAnalyser.ShiftReportFrequency = -1
     process.SiStripAnalyser.StaticUpdateFrequency = 5
     process.SiStripAnalyser.RawDataTag = "rawDataCollector"
-    process.SiStripAnalyser.MonitorSiStripBackPlaneCorrection = False
+    process.SiStripAnalyser.MonitorSiStripBackPlaneCorrection = cms.bool(False)
     process.SiStripClients           = cms.Sequence(process.SiStripAnalyser)
     ### TRACKING
     process.load("DQM.TrackingMonitorClient.TrackingClientConfigP5_cff")
@@ -550,7 +550,7 @@
     process.SiStripAnalyser.ShiftReportFrequency = -1
     process.SiStripAnalyser.StaticUpdateFrequency = 5
     process.SiStripAnalyser.RawDataTag = "rawDataRepacker"
-    process.SiStripAnalyser.MonitorSiStripBackPlaneCorrection = False
+    process.SiStripAnalyser.MonitorSiStripBackPlaneCorrection = cms.bool(False)
     process.SiStripClients           = cms.Sequence(process.SiStripAnalyser)
 
     process.SiStripMonitorDigi.TotalNumberOfDigisFailure.integrateNLumisections = 25

DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py

@@ -63,7 +63,7 @@
 process.source = source
 
 if not unitTest:
-    process.source.inputFileTransitionsEachEvent = True
+    process.source.inputFileTransitionsEachEvent = cms.untracked.bool(True)
     process.source.skipFirstLumis                = True
     process.source.minEventsPerLumi              = 0
     process.source.nextLumiTimeoutMillis         = 10000

DQM/Integration/python/clients/visualization-live_cfg.py

@@ -61,7 +61,7 @@
 process.source = source
 
 if not unitTest:
-    process.source.inputFileTransitionsEachEvent = True
+    process.source.inputFileTransitionsEachEvent = cms.untracked.bool(True)
     process.source.skipFirstLumis                = True
     process.source.minEventsPerLumi              = 0
     process.source.nextLumiTimeoutMillis         = 10000

DQMServices/StreamerIO/scripts/esMonitoring.py

@@ -219,13 +219,14 @@ def handle_close(self):
 
     def handle_read(self):
         rbuf = self.recv(1024*16)
+        rbuf = rbuf.decode('utf-8')
         ## not needed, since asyncore automatically handles close
         #if len(rbuf) == 0:
         #    self.handle_close()
         #    return
 
         self.line_buf.append(rbuf)
-        if b"\n" in rbuf:
+        if "\n" in rbuf:
             # split whatever we have
             spl = "".join(self.line_buf).split("\n")
 

DQMServices/StreamerIO/scripts/ztee.py

@@ -31,7 +31,7 @@ def __init__(self, log_file):
         self.file_truncate_state = None
 
     def write_block(self, data):
-        self.file.write(self.zstream.compress(data))
+        self.file.write(self.zstream.compress( data.encode("utf-8") ))
         self.file.write(self.zstream.flush(zlib.Z_FULL_FLUSH))
 
     def flush_block(self):