Skip to content

Commit

Permalink
Merge pull request #18505 from cms-sw/revert-18201-CMSSW_9_1_X_BeamSp…
Browse files Browse the repository at this point in the history 
…ot_PVSelection

Revert "Adding the possibility to select the PVs before the BeamSpot fit"
  • Loading branch information
@davidlange6
davidlange6 authored Apr 28, 2017
2 parents 94d511e + 11779e9 commit 51750b8
Show file tree
Hide file tree
Showing 8 changed files with 248 additions and 160 deletions.
52 changes: 25 additions & 27 deletions Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducer_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,40 @@
alcaBeamSpotProducer = cms.EDProducer("AlcaBeamSpotProducer",
AlcaBeamSpotProducerParameters = cms.PSet(
RunAllFitters = cms.bool(False), ## False: run only default fitter
RunBeamWidthFit = cms.bool(False),
RunBeamWidthFit = cms.bool(False),
WriteToDB = cms.bool(False), ## do not write results to DB
fitEveryNLumi = cms.untracked.int32( -1 ),
resetEveryNLumi = cms.untracked.int32( -1 )
fitEveryNLumi = cms.untracked.int32( -1 ),
resetEveryNLumi = cms.untracked.int32( -1 )
),
BeamFitter = cms.PSet(
Debug = cms.untracked.bool(False),
TrackCollection = cms.untracked.InputTag('generalTracks'),
Debug = cms.untracked.bool(False),
TrackCollection = cms.untracked.InputTag('generalTracks'),
IsMuonCollection = cms.untracked.bool(False),
WriteAscii = cms.untracked.bool(False),
AsciiFileName = cms.untracked.string('BeamFit.txt'), ## all results
AppendRunToFileName = cms.untracked.bool(True), #runnumber will be inserted to the file name
WriteDIPAscii = cms.untracked.bool(False),
DIPFileName = cms.untracked.string('BeamFitDIP.txt'), ## only the last results, for DIP
SaveNtuple = cms.untracked.bool(False),
SaveFitResults = cms.untracked.bool(False),
AsciiFileName = cms.untracked.string('BeamFit.txt'), ## all results
AppendRunToFileName = cms.untracked.bool(True), #runnumber will be inserted to the file name
WriteDIPAscii = cms.untracked.bool(False),
DIPFileName = cms.untracked.string('BeamFitDIP.txt'), ## only the last results, for DIP
SaveNtuple = cms.untracked.bool(False),
SaveFitResults = cms.untracked.bool(False),
SavePVVertices = cms.untracked.bool(False),
OutputFileName = cms.untracked.string('analyze_d0_phi.root'),
MinimumPt = cms.untracked.double(1.2),
MaximumEta = cms.untracked.double(2.4),
MaximumImpactParameter = cms.untracked.double(5),
MaximumZ = cms.untracked.double(60),
MinimumTotalLayers = cms.untracked.int32(11),
MinimumPixelLayers = cms.untracked.int32(3),
MaximumNormChi2 = cms.untracked.double(2.0),
TrackAlgorithm = cms.untracked.vstring('initialStep'), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
OutputFileName = cms.untracked.string('analyze_d0_phi.root'),
MinimumPt = cms.untracked.double(1.2),
MaximumEta = cms.untracked.double(2.4),
MaximumImpactParameter = cms.untracked.double(5),
MaximumZ = cms.untracked.double(60),
MinimumTotalLayers = cms.untracked.int32(11),
MinimumPixelLayers = cms.untracked.int32(3),
MaximumNormChi2 = cms.untracked.double(2.0),
TrackAlgorithm = cms.untracked.vstring('initialStep'), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
InputBeamWidth = cms.untracked.double(-1.0), ## if -1 use the value calculated by the analyzer
FractionOfFittedTrks = cms.untracked.double(0.9),
MinimumInputTracks = cms.untracked.int32(100)
FractionOfFittedTrks = cms.untracked.double(0.9),
MinimumInputTracks = cms.untracked.int32(100)
),
PVFitter = cms.PSet(
Debug = cms.untracked.bool(False),
Apply3DFit = cms.untracked.bool(False),
Apply3DFit = cms.untracked.bool(False),
VertexCollection = cms.untracked.InputTag('offlinePrimaryVertices'),
#WriteAscii = cms.untracked.bool(True),
#AsciiFileName = cms.untracked.string('PVFit.txt'),
Expand All @@ -50,9 +50,7 @@
maxVertexZ = cms.untracked.double(10),
errorScale = cms.untracked.double(0.9),
nSigmaCut = cms.untracked.double(50.),
FitPerBunchCrossing = cms.untracked.bool(False),
useOnlyFirstPV = cms.untracked.bool(False),
minSumPt = cms.untracked.double(0.)
FitPerBunchCrossing = cms.untracked.bool(False)
)
)

4 changes: 1 addition & 3 deletions DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@
maxVertexZ = cms.untracked.double(10),
errorScale = cms.untracked.double(0.9),
nSigmaCut = cms.untracked.double(5.),
FitPerBunchCrossing = cms.untracked.bool(False),
useOnlyFirstPV = cms.untracked.bool(False),
minSumPt = cms.untracked.double(0.)
FitPerBunchCrossing = cms.untracked.bool(False)
),
)

Expand Down
36 changes: 17 additions & 19 deletions DQM/BeamMonitor/python/BeamMonitorBx_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,38 @@
OnlineMode = cms.untracked.bool(True),
BeamFitter = cms.PSet(
Debug = cms.untracked.bool(False),
TrackCollection = cms.untracked.InputTag('generalTracks'),
IsMuonCollection = cms.untracked.bool(False),
TrackCollection = cms.untracked.InputTag('generalTracks'),
IsMuonCollection = cms.untracked.bool(False),
WriteAscii = cms.untracked.bool(False),
AsciiFileName = cms.untracked.string('BeamFitBx.txt'), ## all results
AppendRunToFileName = cms.untracked.bool(True), #runnumber will be inserted to the file name
WriteDIPAscii = cms.untracked.bool(False),
DIPFileName = cms.untracked.string('BeamFitDIPBx.txt'),
SaveNtuple = cms.untracked.bool(False),
SavePVVertices = cms.untracked.bool(False),
SaveFitResults = cms.untracked.bool(False),
OutputFileName = cms.untracked.string('BeamFitBx.root'), ## ntuple filename
AppendRunToFileName = cms.untracked.bool(True), #runnumber will be inserted to the file name
WriteDIPAscii = cms.untracked.bool(False),
DIPFileName = cms.untracked.string('BeamFitDIPBx.txt'),
SaveNtuple = cms.untracked.bool(False),
SavePVVertices = cms.untracked.bool(False),
SaveFitResults = cms.untracked.bool(False),
OutputFileName = cms.untracked.string('BeamFitBx.root'), ## ntuple filename
MinimumPt = cms.untracked.double(1.0),
MaximumEta = cms.untracked.double(2.4),
MaximumImpactParameter = cms.untracked.double(1.0),
MaximumImpactParameter = cms.untracked.double(1.0),
MaximumZ = cms.untracked.double(60),
MinimumTotalLayers = cms.untracked.int32(6),
MinimumPixelLayers = cms.untracked.int32(0),
MaximumNormChi2 = cms.untracked.double(10.0),
TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
FractionOfFittedTrks = cms.untracked.double(0.9),
InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
FractionOfFittedTrks = cms.untracked.double(0.9),
MinimumInputTracks = cms.untracked.int32(150),
deltaSignificanceCut = cms.untracked.double(10)
),
deltaSignificanceCut = cms.untracked.double(10)
),
PVFitter = cms.PSet(
Debug = cms.untracked.bool(False),
Apply3DFit = cms.untracked.bool(True),
VertexCollection = cms.untracked.InputTag('offlinePrimaryVertices'),
#WriteAscii = cms.untracked.bool(True),
#AsciiFileName = cms.untracked.string('PVFit.txt'),
maxNrStoredVertices = cms.untracked.uint32(10000),
maxNrStoredVertices = cms.untracked.uint32(10000),
minNrVerticesForFit = cms.untracked.uint32(50),
minVertexNdf = cms.untracked.double(10.),
maxVertexNormChi2 = cms.untracked.double(10.),
Expand All @@ -54,10 +54,8 @@
maxVertexZ = cms.untracked.double(10),
errorScale = cms.untracked.double(0.9),
nSigmaCut = cms.untracked.double(5.),
FitPerBunchCrossing = cms.untracked.bool(True),
useOnlyFirstPV = cms.untracked.bool(False),
minSumPt = cms.untracked.double(0.)
),
FitPerBunchCrossing = cms.untracked.bool(True)
),
dxBin = cms.int32(200),
dxMin = cms.double(-1.0),
dxMax = cms.double(1.0),
Expand Down
36 changes: 17 additions & 19 deletions DQM/BeamMonitor/python/BeamMonitor_Pixel_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,38 @@
OnlineMode = cms.untracked.bool(True),
BeamFitter = cms.PSet(
Debug = cms.untracked.bool(False),
TrackCollection = cms.untracked.InputTag('pixelTracks'),
IsMuonCollection = cms.untracked.bool(False),
TrackCollection = cms.untracked.InputTag('pixelTracks'),
IsMuonCollection = cms.untracked.bool(False),
WriteAscii = cms.untracked.bool(False),
AsciiFileName = cms.untracked.string('BeamFit.txt'), ## all results
AppendRunToFileName = cms.untracked.bool(True), #runnumber will be inserted to the file name
WriteDIPAscii = cms.untracked.bool(False),
DIPFileName = cms.untracked.string('BeamFitDIP.txt'),
SaveNtuple = cms.untracked.bool(False),
SavePVVertices = cms.untracked.bool(False),
SaveFitResults = cms.untracked.bool(False),
OutputFileName = cms.untracked.string('BeamFit.root'), ## ntuple filename
AppendRunToFileName = cms.untracked.bool(True), #runnumber will be inserted to the file name
WriteDIPAscii = cms.untracked.bool(False),
DIPFileName = cms.untracked.string('BeamFitDIP.txt'),
SaveNtuple = cms.untracked.bool(False),
SavePVVertices = cms.untracked.bool(False),
SaveFitResults = cms.untracked.bool(False),
OutputFileName = cms.untracked.string('BeamFit.root'), ## ntuple filename
MinimumPt = cms.untracked.double(1.0),
MaximumEta = cms.untracked.double(2.4),
MaximumImpactParameter = cms.untracked.double(1.0),
MaximumImpactParameter = cms.untracked.double(1.0),
MaximumZ = cms.untracked.double(60),
MinimumTotalLayers = cms.untracked.int32(3),
MinimumPixelLayers = cms.untracked.int32(3),
MaximumNormChi2 = cms.untracked.double(30.0),
TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
FractionOfFittedTrks = cms.untracked.double(0.9),
InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
FractionOfFittedTrks = cms.untracked.double(0.9),
MinimumInputTracks = cms.untracked.int32(150),
deltaSignificanceCut = cms.untracked.double(10)
),
deltaSignificanceCut = cms.untracked.double(10)
),
PVFitter = cms.PSet(
Debug = cms.untracked.bool(False),
Apply3DFit = cms.untracked.bool(True),
VertexCollection = cms.untracked.InputTag('pixelVertices'),
#WriteAscii = cms.untracked.bool(True),
#AsciiFileName = cms.untracked.string('PVFit.txt'),
maxNrStoredVertices = cms.untracked.uint32(1000000),
maxNrStoredVertices = cms.untracked.uint32(1000000),
minNrVerticesForFit = cms.untracked.uint32(50),
minVertexNdf = cms.untracked.double(4.),
#--Not used
Expand All @@ -56,10 +56,8 @@
#---------------
errorScale = cms.untracked.double(1.23),
nSigmaCut = cms.untracked.double(50.0),
FitPerBunchCrossing = cms.untracked.bool(False),
useOnlyFirstPV = cms.untracked.bool(False),
minSumPt = cms.untracked.double(0.)
),
FitPerBunchCrossing = cms.untracked.bool(False)
),
dxBin = cms.int32(200),
dxMin = cms.double(-1.0),
dxMax = cms.double(1.0),
Expand Down
36 changes: 17 additions & 19 deletions DQM/BeamMonitor/python/BeamMonitor_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,38 @@
OnlineMode = cms.untracked.bool(True),
BeamFitter = cms.PSet(
Debug = cms.untracked.bool(False),
TrackCollection = cms.untracked.InputTag('generalTracks'),
IsMuonCollection = cms.untracked.bool(False),
TrackCollection = cms.untracked.InputTag('generalTracks'),
IsMuonCollection = cms.untracked.bool(False),
WriteAscii = cms.untracked.bool(False),
AsciiFileName = cms.untracked.string('BeamFit.txt'), ## all results
AppendRunToFileName = cms.untracked.bool(True), #runnumber will be inserted to the file name
WriteDIPAscii = cms.untracked.bool(False),
DIPFileName = cms.untracked.string('BeamFitDIP.txt'),
SaveNtuple = cms.untracked.bool(False),
SavePVVertices = cms.untracked.bool(False),
SaveFitResults = cms.untracked.bool(False),
OutputFileName = cms.untracked.string('BeamFit.root'), ## ntuple filename
AppendRunToFileName = cms.untracked.bool(True), #runnumber will be inserted to the file name
WriteDIPAscii = cms.untracked.bool(False),
DIPFileName = cms.untracked.string('BeamFitDIP.txt'),
SaveNtuple = cms.untracked.bool(False),
SavePVVertices = cms.untracked.bool(False),
SaveFitResults = cms.untracked.bool(False),
OutputFileName = cms.untracked.string('BeamFit.root'), ## ntuple filename
MinimumPt = cms.untracked.double(1.0),
MaximumEta = cms.untracked.double(2.4),
MaximumImpactParameter = cms.untracked.double(1.0),
MaximumImpactParameter = cms.untracked.double(1.0),
MaximumZ = cms.untracked.double(60),
MinimumTotalLayers = cms.untracked.int32(6),
MinimumPixelLayers = cms.untracked.int32(0),
MaximumNormChi2 = cms.untracked.double(10.0),
TrackAlgorithm = cms.untracked.vstring(), ## ctf,rs,cosmics,initialStep,lowPtTripletStep...; for all algos, leave it blank
TrackQuality = cms.untracked.vstring(), ## loose, tight, highPurity...; for all qualities, leave it blank
InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
FractionOfFittedTrks = cms.untracked.double(0.9),
InputBeamWidth = cms.untracked.double(0.0060), ## beam width used for Trk fitter, used only when result from PV is not available
FractionOfFittedTrks = cms.untracked.double(0.9),
MinimumInputTracks = cms.untracked.int32(150),
deltaSignificanceCut = cms.untracked.double(10)
),
deltaSignificanceCut = cms.untracked.double(10)
),
PVFitter = cms.PSet(
Debug = cms.untracked.bool(False),
Apply3DFit = cms.untracked.bool(True),
VertexCollection = cms.untracked.InputTag('offlinePrimaryVertices'),
#WriteAscii = cms.untracked.bool(True),
#AsciiFileName = cms.untracked.string('PVFit.txt'),
maxNrStoredVertices = cms.untracked.uint32(100000),
maxNrStoredVertices = cms.untracked.uint32(100000),
minNrVerticesForFit = cms.untracked.uint32(50),
minVertexNdf = cms.untracked.double(10.),
maxVertexNormChi2 = cms.untracked.double(10.),
Expand All @@ -54,10 +54,8 @@
maxVertexZ = cms.untracked.double(10),
errorScale = cms.untracked.double(0.9),
nSigmaCut = cms.untracked.double(50.),
FitPerBunchCrossing = cms.untracked.bool(False),
useOnlyFirstPV = cms.untracked.bool(False),
minSumPt = cms.untracked.double(0.)
),
FitPerBunchCrossing = cms.untracked.bool(False)
),
dxBin = cms.int32(200),
dxMin = cms.double(-1.0),
dxMax = cms.double(1.0),
Expand Down
Loading

0 comments on commit 51750b8

Please sign in to comment.