Remove long type in DQMServices and Integration [12_0_X]

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/HcalCommon/interface/DQModule.h

@@ -29,8 +29,9 @@ namespace hcaldqm {
 
   class DQModule {
   public:
-    DQModule(edm::ParameterSet const &);
+    DQModule(edm::ParameterSet const&);
     virtual ~DQModule() noexcept(false) {}
+    static void fillPSetDescription(edm::ParameterSetDescription& desc);
 
   protected:
     //	Member variables

DQM/HcalCommon/interface/DQTask.h

@@ -43,6 +43,7 @@ namespace hcaldqm {
     std::shared_ptr<hcaldqm::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const &,
                                                                edm::EventSetup const &) const override;
     void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+    static void fillPSetDescription(edm::ParameterSetDescription &des);
 
   protected:
     // protected funcs

DQM/HcalCommon/src/DQModule.cc

@@ -2,7 +2,7 @@
 #include "DQM/HcalCommon/interface/DQModule.h"
 
 namespace hcaldqm {
-  DQModule::DQModule(edm::ParameterSet const &ps) : _evsTotal(0), _evsPerLS(0) {
+  DQModule::DQModule(edm::ParameterSet const& ps) : _evsTotal(0), _evsPerLS(0) {
     _name = ps.getUntrackedParameter<std::string>("name", "Unknown_Module");
     _debug = ps.getUntrackedParameter<int>("debug", 0);
     _logger.set(_name, _debug);
@@ -26,4 +26,11 @@ namespace hcaldqm {
 
     _logger.debug("Calling Constructor");
   }
+
+  void DQModule::fillPSetDescription(edm::ParameterSetDescription& desc) {
+    desc.addUntracked<std::string>("subsystem", "Hcal");
+    desc.addUntracked("mtype", true);
+    desc.addUntracked<int>("ptype", 0);
+    desc.addUntracked<int>("maxLS", 4000);
+  }
 }  // namespace hcaldqm

DQM/HcalCommon/src/DQTask.cc

@@ -23,6 +23,13 @@ namespace hcaldqm {
     _tokRaw = consumes<FEDRawDataCollection>(_tagRaw);
   }
 
+  void DQTask::fillPSetDescription(edm::ParameterSetDescription &desc) {
+    //from class inheritance
+    hcaldqm::DQModule::fillPSetDescription(desc);
+
+    desc.addUntracked<edm::InputTag>("tagRaw", edm::InputTag("rawDataCollector"));
+  }
+
   /*
  *	By design, all the sources will ahve this function inherited and will
  *	never override.

DQM/HcalTasks/interface/QIE11Task.h

@@ -21,16 +21,17 @@
 
 class QIE11Task : public hcaldqm::DQTask {
 public:
-  QIE11Task(edm::ParameterSet const&);
+  QIE11Task(edm::ParameterSet const &);
   ~QIE11Task() override {}
 
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+  static void fillDescriptions(edm::ConfigurationDescriptions &);
 
 protected:
-  void _process(edm::Event const&, edm::EventSetup const&) override;
+  void _process(edm::Event const &, edm::EventSetup const &) override;
   void _resetMonitors(hcaldqm::UpdateFreq) override;
-  bool _isApplicable(edm::Event const&) override;
+  bool _isApplicable(edm::Event const &) override;
 
   //	tags
   edm::InputTag _tagQIE11;

DQM/HcalTasks/plugins/QIE11Task.cc

@@ -18,6 +18,26 @@ QIE11Task::QIE11Task(edm::ParameterSet const& ps)
   _laserType = ps.getUntrackedParameter<int32_t>("laserType", -1);
   _eventType = ps.getUntrackedParameter<int32_t>("eventType", -1);
 }
+//statis
+void QIE11Task::fillDescriptions(edm::ConfigurationDescriptions& _desc) {
+  edm::ParameterSetDescription desc;
+
+  //from class inheritance
+  hcaldqm::DQTask::fillPSetDescription(desc);
+
+  desc.addUntracked<std::string>("name", "QIE11Task");
+  desc.addUntracked<int>("debug", 0);
+  desc.addUntracked<int>("runkeyVal", 0);
+  desc.addUntracked<std::string>("runkeyName", "pp_run");
+  desc.addUntracked<edm::InputTag>("tagQIE11", edm::InputTag("hcalDigis"));
+  desc.addUntracked<double>("cut", 20);
+  desc.addUntracked<int>("ped", 4);
+  desc.addUntracked<int>("laserType", -1);
+  desc.addUntracked<int>("eventType", -1);
+
+  _desc.addDefault(desc);
+}
+
 /* virtual */ void QIE11Task::bookHistograms(DQMStore::IBooker& ib, edm::Run const& r, edm::EventSetup const& es) {
   if (_ptype == fLocal)
     if (r.runAuxiliary().run() == 1)

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/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.MonitorSiStrip_PSet.MonitorSiStripBackPlaneCorrection = 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.MonitorSiStrip_PSet.MonitorSiStripBackPlaneCorrection = 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.MonitorSiStrip_PSet.MonitorSiStripBackPlaneCorrection = 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.MonitorSiStrip_PSet.MonitorSiStripBackPlaneCorrection = False
     process.SiStripClients           = cms.Sequence(process.SiStripAnalyser)
 
     process.SiStripMonitorDigi.TotalNumberOfDigisFailure.integrateNLumisections = 25

DQM/Integration/python/config/inputsource_cfi.py

@@ -94,6 +94,7 @@
         skipFirstLumis = cms.untracked.bool(options.skipFirstLumis),
         deleteDatFiles = cms.untracked.bool(False),
         endOfRunKills  = cms.untracked.bool(endOfRunKills),
+        inputFileTransitionsEachEvent = cms.untracked.bool(False)
     )
 else:
     print("The list of input files is provided. Disabling discovery and running on everything.")

DQM/Integration/scripts/filecollector/commonAnTS.py

@@ -55,11 +55,11 @@ def prettyPrintUnits(value,unit,decimals=0):
   if unit is "b":
     units=["B","KB","MB","GB","TB"]
     it=iter(units)
-    v=long(value/1024)
+    v=int(value/1024)
     p=0
     runit=next(it)
     while v > 0:
-      v=long(v/1024)
+      v=int(v/1024)
       try:
         runit=next(it)
         p+=1

DQM/Integration/scripts/filecollector/fileCollector.py

@@ -107,10 +107,10 @@ def sendmail(body="Hello from visDQMZipCastorVerifier"):
         time.sleep(WAITTIME)
         continue
 
-      TAGRUNEND=long(sorted(NEW.keys(),reverse=True)[1])
+      TAGRUNEND=int(sorted(NEW.keys(),reverse=True)[1])
 
     else:
-      TAGRUNEND=long(TAGS[0].split("_")[2])
+      TAGRUNEND=int(TAGS[0].split("_")[2])
 
     for tag in TAGS:
       os.remove(tag)

DQM/Integration/scripts/filecollector/producerFileCleanner.py

@@ -84,7 +84,7 @@ def sendmail(body="Hello from producerFileCleanner",subject= "Hello!"):
       time.sleep(WAITTIME)
       continue
 
-    quota=long(diskSize*PRODUCER_DU_BOT/100)
+    quota=int(diskSize*PRODUCER_DU_BOT/100)
     delQuota=diskUsed-quota
     if delQuota > doneSize:
       now = time.time()

DQM/Integration/scripts/filecollector/visDQMSyncDaemon

@@ -52,7 +52,7 @@ INDEPQUEUES   = []
 
 REPODIR     = ""
 DESTDIR     = ""
-MAXQUOTA    = long(0)
+MAXQUOTA    = int(0)
 SAFEFACTOR  = 0.01
 currTime    = time.time()
 unitsDic    = {"B":0,"K":1,"M":2,"G":3,"T":4}
@@ -111,9 +111,9 @@ def getFileList(path, quota = -1,all = True):
 
   if quota > -1:
     for f in sorted(finalFileDict.keys(),key=lambda x:finalFileDict[x][0], reverse=True):
-      if aQuota+long(finalFileDict[f][1]) <= quota:
+      if aQuota+int(finalFileDict[f][1]) <= quota:
         fileList.append(f)
-        aQuota=aQuota+long(finalFileDict[f][1])
+        aQuota=aQuota+int(finalFileDict[f][1])
         continue
       break
   else:
@@ -148,12 +148,12 @@ try:
     elif opt == "--dirs":
       WATCHDIRS=val.split(",")
     elif "--dirs_quotas" == opt:
-      INDEPQUEUES=[ long(i[:-1])*pow(1024,unitsDic[i[-1]]) for i in val.split(",") if i!='' and len(i)>1]
+      INDEPQUEUES=[ int(i[:-1])*pow(1024,unitsDic[i[-1]]) for i in val.split(",") if i!='' and len(i)>1]
   if len(args) != 3:
     print __doc__
     logme('ERROR: Argument ')
     sys.exit(0)
-  MAXQUOTA= long(args[0][:-1])*pow(1024,unitsDic[args[0][-1]])
+  MAXQUOTA= int(args[0][:-1])*pow(1024,unitsDic[args[0][-1]])
   REPODIR = args[1]
   DESTDIR = args[2]      
   if WATCHDIRS:
@@ -168,7 +168,7 @@ try:
   totalQuotaAlloc=sum(dirsQuotaDic.values())
   totalDirs4Alloc=sum([1 for q in dirsQuotaDic.values() if q ==0])
   quota = 0
-  if totalDirs4Alloc > 0: quota=long((MAXQUOTA-totalQuotaAlloc)/totalDirs4Alloc*(1-SAFEFACTOR))
+  if totalDirs4Alloc > 0: quota=int((MAXQUOTA-totalQuotaAlloc)/totalDirs4Alloc*(1-SAFEFACTOR))
   if quota < 0 or totalQuotaAlloc+quota*totalDirs4Alloc > MAXQUOTA:
     logme('ERROR: Auto quota set up error, quota for unallocated directories %d ,Total Individual Quotas Allocation %d - MAX_QUOTA %d. please revise ',quota,totalQuotaAlloc+quota*totalDirs4Alloc, MAXQUOTA )
     sys.exit(0)   

DQM/Integration/scripts/igfilemgr/igmerge

@@ -45,10 +45,10 @@ def numericalSort(x,y):
   if len(yvec) < 3 or len(xvec) < 3:
   	return cmp(x,y) 
 
-  xrun=long(xvec[1].split("_")[1])
-  xevent=long(xvec[2].split("_")[1])
-  yrun=long(yvec[1].split("_")[1])
-  yevent=long(yvec[2].split("_")[1])
+  xrun=int(xvec[1].split("_")[1])
+  xevent=int(xvec[2].split("_")[1])
+  yrun=int(yvec[1].split("_")[1])
+  yevent=int(yvec[2].split("_")[1])
   if xrun < yrun:
   	return -1
   elif xrun > yrun:
@@ -115,7 +115,7 @@ if __name__ == "__main__":
     elif item[0]=="-e":
       KEEP=False
     elif item[0]=="-n":
-      CHUNKSIZE=long(item[1])
+      CHUNKSIZE=int(item[1])
     elif item[0]=="-o":
       MFILENAME=item[1]
     elif item[0]=="--help":
@@ -139,7 +139,7 @@ if __name__ == "__main__":
       TOTALSIZE+=info.compress_size/1024
   print "found %d archived files in %d archives" % (len(MEMBERS),len(ZFHANDLES))
   numfiles=TOTALSIZE/CHUNKSIZE
-  numfiles=long(round(numfiles) + (numfiles-round(numfiles)>0 and 1 or 0 ))
+  numfiles=int(round(numfiles) + (numfiles-round(numfiles)>0 and 1 or 0 ))
   print "The Number of expected requiered files is: %d (could be more)" % numfiles  
 
   print "Starting Merging process..."

DQM/Integration/scripts/igfilemgr/zipmerge

@@ -91,7 +91,7 @@ if __name__ == "__main__":
     elif item[0]=="-e":
       KEEP=False
     elif item[0]=="-n":
-      CHUNKSIZE=long(item[1])
+      CHUNKSIZE=int(item[1])
     elif item[0]=="-o":
       MFILENAME=item[1]
     elif item[0]=="--help":
@@ -115,7 +115,7 @@ if __name__ == "__main__":
       TOTALSIZE+=info.compress_size/1024
   print "found %d archived files in %d archives" % (len(MEMBERS),len(ZFHANDLES))
   numfiles=TOTALSIZE/CHUNKSIZE
-  numfiles=long(round(numfiles) + (numfiles-round(numfiles)>0 and 1 or 0 ))
+  numfiles=int(round(numfiles) + (numfiles-round(numfiles)>0 and 1 or 0 ))
   print "The Number of expected requiered files is: %d (could be more)" % numfiles  
 
   print "Starting Merging process..."

DQM/SiStripMonitorClient/python/SiStripClientConfigP5_Cosmic_cff.py

@@ -21,15 +21,7 @@
     ),
 
 # Parameters for On Demand Monitoring   
-    MonitorSiStripPedestal      = OnDemandMonitoring.MonitorSiStripPedestal,
-    MonitorSiStripNoise         = OnDemandMonitoring.MonitorSiStripNoise,
-    MonitorSiStripQuality       = OnDemandMonitoring.MonitorSiStripQuality,
-    MonitorSiStripApvGain       = OnDemandMonitoring.MonitorSiStripApvGain,
-    MonitorSiStripLorentzAngle  = OnDemandMonitoring.MonitorSiStripLorentzAngle,
-
-    MonitorSiStripCabling        = OnDemandMonitoring.MonitorSiStripCabling,
-    MonitorSiStripLowThreshold   = OnDemandMonitoring.MonitorSiStripLowThreshold,
-    MonitorSiStripHighThreshold  = OnDemandMonitoring.MonitorSiStripHighThreshold,
+    MonitorSiStrip_PSet          = OnDemandMonitoring.MonitorSiStrip_PSet,
 
     FillConditions_PSet          = OnDemandMonitoring.FillConditions_PSet,     
 

DQM/SiStripMonitorClient/python/SiStripClientConfigP5_HeavyIons_cff.py

@@ -36,15 +36,7 @@
     ),
 
 # Parameters for On Demand Monitoring   
-    MonitorSiStripPedestal      = OnDemandMonitoring.MonitorSiStripPedestal,
-    MonitorSiStripNoise         = OnDemandMonitoring.MonitorSiStripNoise,
-    MonitorSiStripQuality       = OnDemandMonitoring.MonitorSiStripQuality,
-    MonitorSiStripApvGain       = OnDemandMonitoring.MonitorSiStripApvGain,
-    MonitorSiStripLorentzAngle  = OnDemandMonitoring.MonitorSiStripLorentzAngle,
-
-    MonitorSiStripCabling        = OnDemandMonitoring.MonitorSiStripCabling,
-    MonitorSiStripLowThreshold   = OnDemandMonitoring.MonitorSiStripLowThreshold,
-    MonitorSiStripHighThreshold  = OnDemandMonitoring.MonitorSiStripHighThreshold,
+    MonitorSiStrip_PSet          = OnDemandMonitoring.MonitorSiStrip_PSet,
 
     FillConditions_PSet          = OnDemandMonitoring.FillConditions_PSet,     
 

DQM/SiStripMonitorClient/python/SiStripClientConfigP5_cff.py

@@ -36,16 +36,7 @@
     ),
 
 # Parameters for On Demand Monitoring   
-    MonitorSiStripBackPlaneCorrection = OnDemandMonitoring.MonitorSiStripBackPlaneCorrection,
-    MonitorSiStripPedestal      = OnDemandMonitoring.MonitorSiStripPedestal,
-    MonitorSiStripNoise         = OnDemandMonitoring.MonitorSiStripNoise,
-    MonitorSiStripQuality       = OnDemandMonitoring.MonitorSiStripQuality,
-    MonitorSiStripApvGain       = OnDemandMonitoring.MonitorSiStripApvGain,
-    MonitorSiStripLorentzAngle  = OnDemandMonitoring.MonitorSiStripLorentzAngle,
-
-    MonitorSiStripCabling        = OnDemandMonitoring.MonitorSiStripCabling,
-    MonitorSiStripLowThreshold   = OnDemandMonitoring.MonitorSiStripLowThreshold,
-    MonitorSiStripHighThreshold  = OnDemandMonitoring.MonitorSiStripHighThreshold,
+    MonitorSiStrip_PSet          = OnDemandMonitoring.MonitorSiStrip_PSet,
 
     FillConditions_PSet          = OnDemandMonitoring.FillConditions_PSet,