Skip to content

Commit

Permalink
Merge pull request #93 from cms-sw/CMSSW_6_2_X_SLHC
Browse files Browse the repository at this point in the history 
Cmssw 6 2 x slhc
  • Loading branch information
@jshlee
jshlee committed Mar 4, 2014
2 parents 50133bb + 0fbcca7 commit 6b5a571
Show file tree
Hide file tree
Showing 15 changed files with 254 additions and 7 deletions.
20 changes: 20 additions & 0 deletions Configuration/Generator/python/FourMuExtendedPt_1_200_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
19 changes: 19 additions & 0 deletions Configuration/Generator/python/SingleElectronPt1000Extended_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
19 changes: 19 additions & 0 deletions Configuration/Generator/python/SingleElectronPt10Extended_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
19 changes: 19 additions & 0 deletions Configuration/Generator/python/SingleElectronPt35Extended_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
19 changes: 19 additions & 0 deletions Configuration/Generator/python/SingleGammaPt10Extended_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
19 changes: 19 additions & 0 deletions Configuration/Generator/python/SingleGammaPt35Extended_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
19 changes: 19 additions & 0 deletions Configuration/Generator/python/SingleMuPt1000Extended_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
19 changes: 19 additions & 0 deletions Configuration/Generator/python/SingleMuPt100Extended_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
19 changes: 19 additions & 0 deletions Configuration/Generator/python/SingleMuPt10Extended_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
19 changes: 19 additions & 0 deletions Configuration/Generator/python/SingleMuPt1Extended_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
20 changes: 20 additions & 0 deletions Configuration/Generator/python/TenMuExtendedE_0_200_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -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)
)
37 changes: 36 additions & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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),
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion Geometry/TrackerNumberingBuilder/plugins/CmsTrackerDiskBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ CmsTrackerDiskBuilder::sortNS( DDFilteredView& fv, GeometricDet* det )
GeometricDet::GeometricDetContainer zmaxpanels; // So, zmin panel is always closer to ip.

uint32_t totalblade = comp.size()/2;
if( totalblade != m_totalBlade )
// std::cout << "pixel_disk " << pixel_disk << endl;
if( totalblade != m_totalBlade && totalblade != 34 )
edm::LogError( "CmsTrackerDiskBuilder" ) << "ERROR, The Total Number of Blade in one disk is " << totalblade << "; configured " << m_totalBlade;

zminpanels.reserve( totalblade );
Expand Down
7 changes: 3 additions & 4 deletions Validation/RecoTrack/python/TrackValidation_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
import PhysicsTools.RecoAlgos.recoTrackSelector_cfi

from SimTracker.TrackerHitAssociation.clusterTpAssociationProducer_cfi import *
from SimTracker.TrackAssociation.trackingParticleRecoTrackAsssociation_cfi import *

TrackAssociatorByHitsRecoDenom= SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHits.clone(
ComponentName = cms.string('TrackAssociatorByHitsRecoDenom'),
)#actually not used but needed to have proper folder names
)

# Validation iterative steps
cutsRecoTracksZero = PhysicsTools.RecoAlgos.recoTrackSelector_cfi.recoTrackSelector.clone()
Expand Down Expand Up @@ -83,7 +82,7 @@
cutsRecoTracksTenthHp.algorithm=cms.vstring("iter10")
cutsRecoTracksTenthHp.quality=cms.vstring("highPurity")

trackValidator= Validation.RecoTrack.MultiTrackValidator_cfi.multiTrackValidator.clone(UseAssociators = cms.bool(False))
trackValidator= Validation.RecoTrack.MultiTrackValidator_cfi.multiTrackValidator.clone()

trackValidator.label=cms.VInputTag(cms.InputTag("generalTracks"),
cms.InputTag("cutsRecoTracksHp"),
Expand Down Expand Up @@ -134,6 +133,6 @@
cutsRecoTracksTenthHp )

# selectors go into separate "prevalidation" sequence
tracksValidation = cms.Sequence( tpClusterProducer * trackingParticleRecoTrackAsssociation * trackValidator)
tracksValidation = cms.Sequence( tpClusterProducer * trackValidator)
tracksValidationFS = cms.Sequence( trackValidator )

3 changes: 2 additions & 1 deletion Validation/RecoVertex/python/VertexValidation_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import FWCore.ParameterSet.Config as cms

from SimTracker.TrackAssociation.trackingParticleRecoTrackAsssociation_cfi import *
from Validation.RecoVertex.v0validator_cfi import *

vertexValidation = cms.Sequence(v0Validator)
vertexValidation = cms.Sequence(trackingParticleRecoTrackAsssociation * v0Validator)

0 comments on commit 6b5a571

Please sign in to comment.