Merge pull request cms-sw#67 from peruzzim/cmssw940

Update to CMSSW 9_4_0
vasile-ghete · Nov 10, 2017 · 34e6033 · 34e6033
2 parents 5f393ff + 1fed070
commit 34e6033
Show file tree

Hide file tree

Showing 125 changed files with 4,433 additions and 2,157 deletions.
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/dataset.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/dataset.py
@@ -889,7 +889,7 @@ def fileList(self, parent=False, firstRun=None, lastRun=None, forcerunselection=
             unknownfilenames, reasons = [], set()
             for filename in fileList[:]:
                 try:
-                    if not firstRun < self.getrunnumberfromfilename(filename) < lastRun:
+                    if not firstRun <= self.getrunnumberfromfilename(filename) <= lastRun:
                         fileList.remove(filename)
                 except AllInOneError as e:
                     if forcerunselection: raise

diff --git a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py
@@ -158,49 +158,59 @@
 
 es_prefer_hcalHardcode = cms.ESPrefer("HcalHardcodeCalibrations", "es_hardcode")
 
+_toGet = [
+    'GainWidths',
+    'MCParams',
+    'RecoParams',
+    'RespCorrs',
+    'QIEData',
+    'QIETypes',
+    'Gains',
+    'Pedestals',
+    'PedestalWidths',
+    'ChannelQuality',
+    'ZSThresholds',
+    'TimeCorrs',
+    'LUTCorrs',
+    'LutMetadata',
+    'L1TriggerObjects',
+    'PFCorrs',
+    'ElectronicsMap',
+    'FrontEndMap',
+    'CovarianceMatrices',
+    'SiPMParameters',
+    'SiPMCharacteristics',
+    'TPChannelParameters',
+    'TPParameters',
+    'FlagHFDigiTimeParams'
+]
+
+_toGet_noEmap = _toGet[:]
+_toGet_noEmap.remove('ElectronicsMap')
+
+
 from Configuration.Eras.Modifier_hcalHardcodeConditions_cff import hcalHardcodeConditions
 hcalHardcodeConditions.toModify( es_hardcode,
-	toGet = cms.untracked.vstring(
-		'GainWidths',
-		'MCParams',
-		'RecoParams',
-		'RespCorrs',
-		'QIEData',
-		'QIETypes',
-		'Gains',
-		'Pedestals',
-		'PedestalWidths',
-		'ChannelQuality',
-		'ZSThresholds',
-		'TimeCorrs',
-		'LUTCorrs',
-		'LutMetadata',
-		'L1TriggerObjects',
-		'PFCorrs',
-		'ElectronicsMap',
-		'FrontEndMap',
-		'CovarianceMatrices',
-		'SiPMParameters',
-		'SiPMCharacteristics',
-		'TPChannelParameters',
-		'TPParameters',
-		'FlagHFDigiTimeParams'
-	),
-	GainWidthsForTrigPrims = cms.bool(True) 
+    toGet = cms.untracked.vstring(_toGet),
+    GainWidthsForTrigPrims = cms.bool(True) 
 )
 
 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
 from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017
 from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017
 from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017
 from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
+from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal
 
 run2_HCAL_2017.toModify( es_hardcode, useLayer0Weight = cms.bool(True) )
 run2_HF_2017.toModify( es_hardcode, useHFUpgrade = cms.bool(True) )
 run2_HE_2017.toModify( es_hardcode, useHEUpgrade = cms.bool(True), HEreCalibCutoff = cms.double(100.0) )
 run2_HEPlan1_2017.toModify( es_hardcode, testHEPlan1 = cms.bool(True), useHEUpgrade = cms.bool(False), HEreCalibCutoff = cms.double(20.0) )
 run3_HB.toModify( es_hardcode, useHBUpgrade = cms.bool(True), HBreCalibCutoff = cms.double(100.0) )
 
+# now that we have an emap
+phase2_hcal.toModify( es_hardcode, toGet = cms.untracked.vstring(_toGet_noEmap) )
+
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toModify( es_hardcode, killHE = cms.bool(True) )
 
diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc
@@ -1399,8 +1399,8 @@ void SiStripGainFromCalibTree::qualityMonitor() {
             if(FitMPV>0.) Gains->Fill(Gain);
 
             MPVs->Fill(FitMPV);
-            if(Thickness<0.04) MPVs320->Fill(Phi,FitMPV);
-            if(Thickness>0.04) MPVs500->Fill(Phi,FitMPV);
+            if(Thickness<0.04) MPVs320->Fill(FitMPV);
+            if(Thickness>0.04) MPVs500->Fill(FitMPV);
 
             MPVError->Fill(FitMPVErr);
             MPVErrorVsMPV->Fill(FitMPV,FitMPVErr);

diff --git a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc
@@ -271,8 +271,8 @@ SiStripGainsPCLHarvester::gainQualityMonitor(DQMStore::IBooker& ibooker_, const
        if(FitMPV>0.) Gains->Fill(Gain);
 
        MPVs->Fill(FitMPV);
-       if(Thickness<0.04) MPVs320->Fill(Phi,FitMPV);
-       if(Thickness>0.04) MPVs500->Fill(Phi,FitMPV);
+       if(Thickness<0.04) MPVs320->Fill(FitMPV);
+       if(Thickness>0.04) MPVs500->Fill(FitMPV);
 
        MPVError->Fill(FitMPVErr);
        MPVErrorVsMPV->Fill(FitMPV,FitMPVErr);

diff --git a/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C b/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C