Merge pull request #98 from cms-sw/CMSSW_6_2_X_SLHC

Cmssw 6 2 x slhc

Configuration/Generator/python/FourMuExtendedPt_1_200_cfi.py

@@ -0,0 +1,20 @@
+import FWCore.ParameterSet.Config as cms
+
+# Modified from Configuration/Generator/python/SingleMuPt10_cfi.py
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(200.0),
+        MinPt = cms.double(0.9),
+        PartID = cms.vint32(-13,-13),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('Four mu pt 1 to 200'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/SingleElectronPt1000Extended_cfi.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(1000.01),
+        MinPt = cms.double(999.99),
+        PartID = cms.vint32(11),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('single electron pt 1000'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/SingleElectronPt10Extended_cfi.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(10.01),
+        MinPt = cms.double(9.99),
+        PartID = cms.vint32(11),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('single electron pt 10'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/SingleElectronPt35Extended_cfi.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(35.01),
+        MinPt = cms.double(34.99),
+        PartID = cms.vint32(11),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('single electron pt 35'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/SingleGammaPt10Extended_cfi.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(10.01),
+        MinPt = cms.double(9.99),
+        PartID = cms.vint32(22),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('single gamma pt 10'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/SingleGammaPt35Extended_cfi.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(35.01),
+        MinPt = cms.double(34.99),
+        PartID = cms.vint32(22),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('single gamma pt 35'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/SingleMuPt1000Extended_cfi.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(1000.01),
+        MinPt = cms.double(999.99),
+        PartID = cms.vint32(-13),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('single mu pt 1000'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/SingleMuPt100Extended_cfi.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(100.01),
+        MinPt = cms.double(99.99),
+        PartID = cms.vint32(-13),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('single mu pt 100'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/SingleMuPt10Extended_cfi.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(10.01),
+        MinPt = cms.double(9.99),
+        PartID = cms.vint32(-13),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('single mu pt 10'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/SingleMuPt1Extended_cfi.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+generator = cms.EDProducer("FlatRandomPtGunProducer",
+    PGunParameters = cms.PSet(
+        MaxPt = cms.double(1.01),
+        MinPt = cms.double(0.99),
+        PartID = cms.vint32(-13),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('single mu pt 1'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/Generator/python/TenMuExtendedE_0_200_cfi.py

@@ -0,0 +1,20 @@
+import FWCore.ParameterSet.Config as cms
+
+# Modified from Configuration/Generator/python/SingleMuPt10_cfi.py
+generator = cms.EDProducer("FlatRandomEGunProducer",
+    PGunParameters = cms.PSet(
+        MaxE = cms.double(200.0),
+        MinE = cms.double(0.0),
+        PartID = cms.vint32(-13,-13,-13,-13,-13),
+        MaxEta = cms.double(4.0),
+        MaxPhi = cms.double(3.14159265359),
+        MinEta = cms.double(-4.0),
+        MinPhi = cms.double(-3.14159265359) ## in radians
+
+    ),
+    Verbosity = cms.untracked.int32(0), ## set to 1 (or greater)  for printouts
+
+    psethack = cms.string('Ten mu e 0 to 200'),
+    AddAntiParticle = cms.bool(True),
+    firstRun = cms.untracked.uint32(1)
+)

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1130,8 +1130,8 @@ def genvalid(fragment,d,suffix='all',fi=''):
              '2019WithGEM' : 'auto:upgrade2019',
              '2017Aging' : 'W17_300_62E2::All',
              '2019Aging' : 'W19_300_62E2::All',
-             'BE5D' : 'auto:upgrade2019',
-             'BE5DPixel10D' : 'auto:upgrade2019',
+             'BE5D' : 'auto:upgradePLS3',
+             'BE5DPixel10D' : 'auto:upgradePLS3',
              '2017Fast' : 'auto:upgrade2017',
              'BE5DFast' : 'auto:upgrade2019',
              'BE5DForwardFast' : 'auto:upgrade2019',
@@ -1158,7 +1158,7 @@ def genvalid(fragment,d,suffix='all',fi=''):
                  'Extended2023HGCalMuon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
                  'Extended2023SHCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
                  'Extended2023SHCal4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
-                 'Extended2023TTI' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms_TTI.cust_phase2_BE5D',
+                 'Extended2023TTI' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023TTI',
                  'Extended2023Muon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Muon',
                  'Extended2023CFCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
                  'Extended2023CFCal4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023'
@@ -1181,7 +1181,7 @@ def genvalid(fragment,d,suffix='all',fi=''):
                    '2019WithGEM':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
                    '2017Aging':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
                    '2019Aging':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
-                   'BE5D':['GenSimFull','DigiTrkTrigFull','RecoFull','HARVESTFull'],
+                   'BE5D':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
                    'BE5DPixel10D':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
                    '2017Fast':['FastSim','HARVESTFast'],
                    'BE5DFast':['FastSim','HARVESTFast'],
@@ -1190,7 +1190,7 @@ def genvalid(fragment,d,suffix='all',fi=''):
                    'Extended2023HGCalMuon':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
                    'Extended2023SHCal':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
                    'Extended2023SHCal4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
-                   'Extended2023TTI':['GenSimFull','DigiTrkTrigFull','RecoFull','HARVESTFull'],
+                   'Extended2023TTI':['GenSimFull','DigiTrkTrigFull'], ##no need to go beyond local reco
                    'Extended2023Muon':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
                    'Extended2023CFCal':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
                    'Extended2023CFCal4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull']
@@ -1224,7 +1224,7 @@ def genvalid(fragment,d,suffix='all',fi=''):
                                       }
     if upgradeCustoms[k]!=None : upgradeStepDict['DigiFull'][k]['--customise']=upgradeCustoms[k]
 
-    upgradeStepDict['DigiTrkTrigFull'][k] = {'-s':'DIGI:pdigi_valid,L1,L1TrackTrigger,DIGI2RAW',
+    upgradeStepDict['DigiTrkTrigFull'][k] = {'-s':'DIGI:pdigi_valid,L1,L1TrackTrigger,DIGI2RAW,RECO:pixeltrackerlocalreco',
                                              '--conditions':upgradeGTs[k],
                                              '--datatier':'GEN-SIM-DIGI-RAW',
                                              '-n':'10',
@@ -1285,9 +1285,23 @@ def genvalid(fragment,d,suffix='all',fi=''):
                   'QCD_Pt_80_120_14TeV_cfi','H200ChargedTaus_Tauola_14TeV_cfi','JpsiMM_14TeV_cfi','TTbar_Tauola_14TeV_cfi',
                   'WE_14TeV_cfi','ZEE_14TeV_cfi','ZTT_Tauola_All_hadronic_14TeV_cfi','H130GGgluonfusion_14TeV_cfi',
                   'PhotonJet_Pt_10_14TeV_cfi','QQH1352T_Tauola_14TeV_cfi',
-                  'MinBias_TuneZ2star_14TeV_pythia6_cff','WM_14TeV_cfi','ZMM_14TeV_cfi']
+                  'MinBias_TuneZ2star_14TeV_pythia6_cff','WM_14TeV_cfi','ZMM_14TeV_cfi',
+		  'FourMuExtendedPt_1_200_cfi',
+		  'TenMuExtendedE_0_200_cfi',
+		  'SingleElectronPt10Extended_cfi',
+                  'SingleElectronPt35Extended_cfi',
+		  'SingleElectronPt1000Extended_cfi',
+                  'SingleGammaPt10Extended_cfi',
+		  'SingleGammaPt35Extended_cfi',
+		  'SingleMuPt1Extended_cfi',
+		  'SingleMuPt10Extended_cfi',
+                  'SingleMuPt100Extended_cfi',
+		  'SingleMuPt1000Extended_cfi','TenMuE_0_200_cfi']
 
 howMuches={'FourMuPt_1_200_cfi':Kby(10,100),
+           'TenMuE_0_200_cfi':Kby(10,100),
+           'FourMuExtendedPt_1_200_cfi':Kby(10,100),
+           'TenMuExtendedE_0_200_cfi':Kby(10,100),
            'SingleElectronPt10_cfi':Kby(9,300),
            'SingleElectronPt35_cfi':Kby(9,500),
            'SingleElectronPt1000_cfi':Kby(9,50),
@@ -1297,6 +1311,15 @@ def genvalid(fragment,d,suffix='all',fi=''):
            'SingleMuPt10_cfi':Kby(25,500),
            'SingleMuPt100_cfi':Kby(9,500),
            'SingleMuPt1000_cfi':Kby(9,500),
+           'SingleElectronPt10Extended_cfi':Kby(9,300),
+           'SingleElectronPt35Extended_cfi':Kby(9,500),
+           'SingleElectronPt1000Extended_cfi':Kby(9,50),
+           'SingleGammaPt10Extended_cfi':Kby(9,300),
+           'SingleGammaPt35Extended_cfi':Kby(9,50),
+           'SingleMuPt1Extended_cfi':Kby(25,1000),
+           'SingleMuPt10Extended_cfi':Kby(25,500),
+           'SingleMuPt100Extended_cfi':Kby(9,500),
+           'SingleMuPt1000Extended_cfi':Kby(9,500),
            'TTbarLepton_Tauola_8TeV_cfi':Kby(9,100),
            'Wjet_Pt_80_120_8TeV_cfi':Kby(9,100),
            'Wjet_Pt_3000_3500_8TeV_cfi':Kby(9,50),
@@ -1339,6 +1362,9 @@ def genvalid(fragment,d,suffix='all',fi=''):
            }
 
 upgradeDatasetFromFragment={'FourMuPt_1_200_cfi': 'FourMuPt1_200',
+                            'FourMuExtendedPt_1_200_cfi': 'FourMuExtendedPt1_200',
+                            'TenMuE_0_200_cfi': 'TenMuE_0_200',
+                            'TenMuExtendedE_0_200_cfi': 'TenMuExtendedE_0_200',
                             'SingleElectronPt10_cfi' : 'SingleElectronPt10',
                             'SingleElectronPt35_cfi' : 'SingleElectronPt35',
                             'SingleElectronPt1000_cfi' : 'SingleElectronPt1000',
@@ -1348,6 +1374,15 @@ def genvalid(fragment,d,suffix='all',fi=''):
                             'SingleMuPt10_cfi' : 'SingleMuPt10',
                             'SingleMuPt100_cfi' : 'SingleMuPt100',
                             'SingleMuPt1000_cfi' : 'SingleMuPt1000',
+                            'SingleElectronPt10Extended_cfi' : 'SingleElectronPt10Extended',
+                            'SingleElectronPt35Extended_cfi' : 'SingleElectronPt35Extended',
+                            'SingleElectronPt1000Extended_cfi' : 'SingleElectronPt1000Extended',
+                            'SingleGammaPt10Extended_cfi' : 'SingleGammaPt10Extended',
+                            'SingleGammaPt35Extended_cfi' : 'SingleGammaPt35Extended',
+                            'SingleMuPt1Extended_cfi' : 'SingleMuPt1Extended',
+                            'SingleMuPt10Extended_cfi' : 'SingleMuPt10Extended',
+                            'SingleMuPt100Extended_cfi' : 'SingleMuPt100Extended',
+                            'SingleMuPt1000Extended_cfi' : 'SingleMuPt1000Extended',
                             'TTbarLepton_Tauola_8TeV_cfi' : 'TTbarLepton_8TeV',
                             'Wjet_Pt_80_120_8TeV_cfi' : 'Wjet_Pt_80_120_8TeV',
                             'Wjet_Pt_3000_3500_8TeV_cfi' : 'Wjet_Pt_3000_3500_8TeV',

DQMServices/ClientConfig/interface/DQMGenericClient.h

@@ -10,6 +10,7 @@
  *  $Revision: 1.10 $
  *
  *  \author Junghwan Goh - SungKyunKwan University
+ *  \modified Cesare Calabria - Università & INFN Bari
  */
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
@@ -78,7 +79,7 @@ class DQMGenericClient : public edm::EDAnalyzer
   void normalizeToEntries(const std::string& startDir, const std::string& histName, const std::string& normHistName);
   void makeCumulativeDist(const std::string& startDir, const std::string& cdName);
 
-  void limitedFit(MonitorElement * srcME, MonitorElement * meanME, MonitorElement * sigmaME);
+  void limitedFit(MonitorElement * srcME, MonitorElement * meanME, MonitorElement * sigmaME, MonitorElement * rmsME);
 
  private:
   unsigned int verbose_;

DQMServices/ClientConfig/interface/FitSlicesYTool.h

@@ -7,6 +7,7 @@
  *  $Date: 2009/03/27 00:16:49 $
  *  $Revision: 1.1 $
  *  \author cerati
+ *  \modified calabria
  */
 
 #include <TH2F.h>
@@ -29,7 +30,10 @@ class FitSlicesYTool {
   void getFittedMeanWithError(MonitorElement*);
   /// Fill the ME with the sigma value (with error) of the gaussian fit in each slice
   void getFittedSigmaWithError(MonitorElement*);
+  /// Fill the ME with the RMS value (with error) of each slice
+  void getRMS(MonitorElement*);
  private:
+  TH2F* h2D;
   TH1* h0;
   TH1* h1;
   TH1* h2;