diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProd_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProd_cff.py index 6f140df839c80..f4d98414c0214 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProd_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProd_cff.py @@ -15,27 +15,7 @@ # ------------------------------------------------------------------------------ # configure the beam-spot production from Calibration.TkAlCaRecoProducers.AlcaBeamSpotProducer_cff import * -alcaBeamSpotProducer.BeamFitter.TrackCollection = 'ALCARECOTkAlMinBias' -alcaBeamSpotProducer.BeamFitter.MinimumTotalLayers = 6 -alcaBeamSpotProducer.BeamFitter.MinimumPixelLayers = -1 -alcaBeamSpotProducer.BeamFitter.MaximumNormChi2 = 10 -alcaBeamSpotProducer.BeamFitter.MinimumInputTracks = 50 -alcaBeamSpotProducer.BeamFitter.MinimumPt = 1.0 -alcaBeamSpotProducer.BeamFitter.MaximumImpactParameter = 1.0 -alcaBeamSpotProducer.BeamFitter.TrackAlgorithm = cms.untracked.vstring() -#alcaBeamSpotProducer.BeamFitter.Debug = True -alcaBeamSpotProducer.PVFitter.Apply3DFit = True -alcaBeamSpotProducer.PVFitter.minNrVerticesForFit = 10 -# fit as function of lumi sections -alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.fitEveryNLumi = 1 -alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.resetEveryNLumi = 1 - -# alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.TrackCollection = cms.untracked.InputTag('ALCARECOTkAlMinBias') -# alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.fitEveryNLumi = cms.untracked.int32(1) -# alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.resetEveryNLumi = cms.untracked.int32(1) -# alcaBeamSpotProducer.AlcaBeamSpotProducerParameters.TrackCollection = cms.untracked.InputTag('ALCARECOTkAlMinBias') -# alcaBeamSpotProducer.BeamFitter.TrackCollection = cms.untracked.InputTag('ALCARECOTkAlMinBias') # ------------------------------------------------------------------------------ # this is for filtering on L1 technical trigger bit @@ -51,38 +31,6 @@ throw = False # tolerate triggers stated above, but not available ) - -#from L1TriggerConfig.L1GtConfigProducers.L1GtTriggerMaskTechTrigConfig_cff import * -#from HLTrigger.HLTfilters.hltLevel1GTSeed_cfi import hltLevel1GTSeed -#L1CollTrigger = hltLevel1GTSeed.clone() - -#L1CollTrigger.L1TechTriggerSeeding = cms.bool(True) -#L1CollTrigger.L1SeedsLogicalExpression = cms.string('0 AND ( 40 OR 41 ) AND NOT (36 OR 37 OR 38 OR 39)') - - -# ------------------------------------------------------------------------------ -# configuration to reproduce offlinePrimaryVertices -# FIXME: needs to be moved in the TkAlMinBias definition -# from RecoVertex.BeamSpotProducer.BeamSpot_cfi import * -# offlineBeamSpotForBS = offlineBeamSpot.clone() -# from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import * - -# # overwrite some defaults for PV producer -# offlinePrimaryVerticesForBS = offlinePrimaryVertices.clone() -# offlinePrimaryVerticesForBS.TrackLabel = cms.InputTag("ALCARECOTkAlMinBias") -# offlinePrimaryVerticesForBS.beamSpotLabel = cms.InputTag("offlineBeamSpotForBS") -# offlinePrimaryVerticesForBS.PVSelParameters.maxDistanceToBeam = 2 -# offlinePrimaryVerticesForBS.TkFilterParameters.maxNormalizedChi2 = 20 -# offlinePrimaryVerticesForBS.TkFilterParameters.minSiliconLayersWithHits = 5 -# offlinePrimaryVerticesForBS.TkFilterParameters.maxD0Significance = 100 -# offlinePrimaryVerticesForBS.TkFilterParameters.minPixelLayersWithHits = 1 -# offlinePrimaryVerticesForBS.TkClusParameters.TkGapClusParameters.zSeparation = 1 -# alcaBeamSpotProducer.PVFitter.VertexCollection = "offlinePrimaryVerticesForBS" - seqALCARECOPromptCalibProd = cms.Sequence(ALCARECOTkAlMinBiasFilterForBS * ALCARECOHltFilterForBS * -# offlineBeamSpotForBS + -# offlinePrimaryVerticesForBS + alcaBeamSpotProducer) - -#process.bsProductionPath = cms.Path(process.TkAlMinBiasFilterForBS+process.alcaBeamSpotProducer) diff --git a/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducerHP_cfi.py b/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducerHP_cfi.py index 7f839bd28b064..c18017733c1f9 100644 --- a/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducerHP_cfi.py +++ b/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducerHP_cfi.py @@ -48,7 +48,7 @@ minVertexMeanWeight = cms.untracked.double(0.5), maxVertexR = cms.untracked.double(2), maxVertexZ = cms.untracked.double(10), - errorScale = cms.untracked.double(1.1), + errorScale = cms.untracked.double(1.0), nSigmaCut = cms.untracked.double(50.), FitPerBunchCrossing = cms.untracked.bool(False), useOnlyFirstPV = cms.untracked.bool(True), diff --git a/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducer_cfi.py b/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducer_cfi.py index baf157d326cdf..1bf082eb64e39 100644 --- a/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducer_cfi.py +++ b/Calibration/TkAlCaRecoProducers/python/AlcaBeamSpotProducer_cfi.py @@ -5,12 +5,12 @@ RunAllFitters = cms.bool(False), ## False: run only default fitter 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'), + TrackCollection = cms.untracked.InputTag('ALCARECOTkAlMinBias'), IsMuonCollection = cms.untracked.bool(False), WriteAscii = cms.untracked.bool(False), AsciiFileName = cms.untracked.string('BeamFit.txt'), ## all results @@ -21,34 +21,34 @@ SaveFitResults = cms.untracked.bool(False), SavePVVertices = cms.untracked.bool(False), OutputFileName = cms.untracked.string('analyze_d0_phi.root'), - MinimumPt = cms.untracked.double(1.2), + MinimumPt = cms.untracked.double(1.0), MaximumEta = cms.untracked.double(2.4), - MaximumImpactParameter = cms.untracked.double(5), + MaximumImpactParameter = cms.untracked.double(1.0), 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 + MinimumTotalLayers = cms.untracked.int32(6), + MinimumPixelLayers = cms.untracked.int32(-1), + 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(-1.0), ## if -1 use the value calculated by the analyzer FractionOfFittedTrks = cms.untracked.double(0.9), - MinimumInputTracks = cms.untracked.int32(100) + MinimumInputTracks = cms.untracked.int32(50) ), PVFitter = cms.PSet( Debug = cms.untracked.bool(False), - Apply3DFit = 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), - minNrVerticesForFit = cms.untracked.uint32(100), + minNrVerticesForFit = cms.untracked.uint32(10), minVertexNdf = cms.untracked.double(10.), maxVertexNormChi2 = cms.untracked.double(10.), minVertexNTracks = cms.untracked.uint32(0), minVertexMeanWeight = cms.untracked.double(0.5), maxVertexR = cms.untracked.double(2), maxVertexZ = cms.untracked.double(10), - errorScale = cms.untracked.double(0.9), + errorScale = cms.untracked.double(1.0), nSigmaCut = cms.untracked.double(50.), FitPerBunchCrossing = cms.untracked.bool(False), useOnlyFirstPV = cms.untracked.bool(False),