From a5afc824c6e9b6b51fa6ad578c182b48c4732601 Mon Sep 17 00:00:00 2001 From: Wesley Terrill Date: Mon, 29 Jun 2020 19:05:22 +0200 Subject: [PATCH 01/11] added info for customize_CaloJet function --- python/customise.py | 89 +++++++++++++++++++++++++++++++++- test/runHLTBTagAnalyzer_cfg.py | 2 + 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/python/customise.py b/python/customise.py index 6e6be129772..847a2777851 100644 --- a/python/customise.py +++ b/python/customise.py @@ -112,7 +112,7 @@ def customize_HLTDeepCSVPF(process,ptVal=0.9): seedMin3DIPSignificance = cms.double(1.2), seedMin3DIPValue = cms.double(0.005) ), - fitterRatio = cms.double(0.25), + fitterRatio = cms.double(0.25), fitterSigmacut = cms.double(3.0), fitterTini = cms.double(256.0), maxNTracks = cms.uint32(30), @@ -147,4 +147,91 @@ def customize_HLTDeepCSVPF(process,ptVal=0.9): return process +def customize_CaloJet(process,ptVal=0.9): #FIXME + + ptStr = str(ptVal).replace(".","p") + + setattr(process,"hltDeepCombinedSecondaryVertexBJetTagsInfosCalo"+ptStr, + cms.EDProducer("TrackDeepNNTagInfoProducer", + computer = cms.PSet( + SoftLeptonFlip = cms.bool(False), + charmCut = cms.double(1.5), + correctVertexMass = cms.bool(True), + minimumTrackWeight = cms.double(0.5), + pseudoMultiplicityMin = cms.uint32(2), + pseudoVertexV0Filter = cms.PSet( + k0sMassWindow = cms.double(0.05) + ), + trackFlip = cms.bool(False), + trackMultiplicityMin = cms.uint32(2), + trackPairV0Filter = cms.PSet( + k0sMassWindow = cms.double(0.03) + ), + trackPseudoSelection = cms.PSet( + a_dR = cms.double(-0.001053), + a_pT = cms.double(0.005263), + b_dR = cms.double(0.6263), + b_pT = cms.double(0.3684), + jetDeltaRMax = cms.double(0.3), + maxDecayLen = cms.double(5.0), + maxDistToAxis = cms.double(0.07), + max_pT = cms.double(500.0), + max_pT_dRcut = cms.double(0.1), + max_pT_trackPTcut = cms.double(3.0), + min_pT = cms.double(120.0), + min_pT_dRcut = cms.double(0.5), + normChi2Max = cms.double(99999.9), + pixelHitsMin = cms.uint32(0), + ptMin = cms.double(0.0), + qualityClass = cms.string('any'), + sip2dSigMax = cms.double(99999.9), + sip2dSigMin = cms.double(2.0), + sip2dValMax = cms.double(99999.9), + sip2dValMin = cms.double(-99999.9), + sip3dSigMax = cms.double(99999.9), + sip3dSigMin = cms.double(-99999.9), + sip3dValMax = cms.double(99999.9), + sip3dValMin = cms.double(-99999.9), + totalHitsMin = cms.uint32(0), + useVariableJTA = cms.bool(False) + ), + trackSelection = cms.PSet( + a_dR = cms.double(-0.001053), + a_pT = cms.double(0.005263), + b_dR = cms.double(0.6263), + b_pT = cms.double(0.3684), + jetDeltaRMax = cms.double(0.3), + maxDecayLen = cms.double(5.0), + maxDistToAxis = cms.double(0.07), + max_pT = cms.double(500.0), + max_pT_dRcut = cms.double(0.1), + max_pT_trackPTcut = cms.double(3.0), + min_pT = cms.double(120.0), + min_pT_dRcut = cms.double(0.5), + normChi2Max = cms.double(99999.9), + pixelHitsMin = cms.uint32(0), + ptMin = cms.double(0.0), + qualityClass = cms.string('any'), + sip2dSigMax = cms.double(99999.9), + sip2dSigMin = cms.double(-99999.9), + sip2dValMax = cms.double(99999.9), + sip2dValMin = cms.double(-99999.9), + sip3dSigMax = cms.double(99999.9), + sip3dSigMin = cms.double(-99999.9), + sip3dValMax = cms.double(99999.9), + sip3dValMin = cms.double(-99999.9), + totalHitsMin = cms.uint32(0), + useVariableJTA = cms.bool(False) + ), + trackSort = cms.string('sip2dSig'), + useTrackWeights = cms.bool(True), + vertexFlip = cms.bool(False) + ), + svTagInfos=cms.InputTag("hltInclusiveSecondaryVertexFinderTagInfos") + ) + ) + + return process + + diff --git a/test/runHLTBTagAnalyzer_cfg.py b/test/runHLTBTagAnalyzer_cfg.py index 2229e125a96..b2011e72e8b 100644 --- a/test/runHLTBTagAnalyzer_cfg.py +++ b/test/runHLTBTagAnalyzer_cfg.py @@ -23090,6 +23090,8 @@ from RecoBTag.PerformanceMeasurements.customise import customize_HLTDeepCSVPF process = customize_HLTDeepCSVPF(process,options.trackPtSeed) +from RecoBTag.Performance.customise import customize_CaloJet +process = customize_CaloJet(process, options.trackPtSeed) ## Define analyzer sequence process.analyzerSeq = cms.Sequence( ) From ff8f86d1aa3f47cf5eaf017cb32f948ce9a2910f Mon Sep 17 00:00:00 2001 From: Wesley Terrill Date: Mon, 29 Jun 2020 20:59:14 +0200 Subject: [PATCH 02/11] added replace features to Calo function --- python/customise.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/python/customise.py b/python/customise.py index 847a2777851..ad5ff424e70 100644 --- a/python/customise.py +++ b/python/customise.py @@ -230,8 +230,16 @@ def customize_CaloJet(process,ptVal=0.9): #FIXME svTagInfos=cms.InputTag("hltInclusiveSecondaryVertexFinderTagInfos") ) ) + + process.hltDeepCombinedSecondaryVertexBJetTagsCalo.src = "hltDeepCombinedSecondaryVertexBJetTagsInfosCalo"+ptStr - return process + process.HLTBtagDeepCSVSequenceL3.replace( + process.hltDeepCombinedSecondaryVertexBJetTagsInfosCalo, + getattr(process,"hltDeepCombinedSecondaryVertexBJetTagsInfosCalo"+ptStr) + ) + + + return process From aacc0f43cd5a2fbc98d587e012ede5c362e4f885 Mon Sep 17 00:00:00 2001 From: Wesley Terrill Date: Mon, 29 Jun 2020 21:58:10 +0200 Subject: [PATCH 03/11] fork commit --- test/runHLTBTagAnalyzer_cfg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runHLTBTagAnalyzer_cfg.py b/test/runHLTBTagAnalyzer_cfg.py index b2011e72e8b..8bf9ff4ba03 100644 --- a/test/runHLTBTagAnalyzer_cfg.py +++ b/test/runHLTBTagAnalyzer_cfg.py @@ -8689,7 +8689,7 @@ extSVCollection = cms.InputTag("hltDeepInclusiveMergedVerticesPF"), extSVDeltaRToJet = cms.double(0.3), minimumTrackWeight = cms.double(0.5), - trackIPTagInfos = cms.InputTag("hltDeepBLifetimeTagInfosPF"), + trackIPTagInfos = cms.InputTag("hltDeepBLifetimeTagInfosPF"), #FIXME trackSelection = cms.PSet( a_dR = cms.double(-0.001053), a_pT = cms.double(0.005263), @@ -23090,7 +23090,7 @@ from RecoBTag.PerformanceMeasurements.customise import customize_HLTDeepCSVPF process = customize_HLTDeepCSVPF(process,options.trackPtSeed) -from RecoBTag.Performance.customise import customize_CaloJet +from RecoBTag.PerformanceMeasurements.customise import customize_CaloJet process = customize_CaloJet(process, options.trackPtSeed) ## Define analyzer sequence From 4de73c85cc2e192f5a1943f021a332ae949babf9 Mon Sep 17 00:00:00 2001 From: Wesley Terrill Date: Mon, 29 Jun 2020 22:15:45 +0200 Subject: [PATCH 04/11] customise.py update --- python/customise.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/customise.py b/python/customise.py index ad5ff424e70..147a3b68425 100644 --- a/python/customise.py +++ b/python/customise.py @@ -146,7 +146,7 @@ def customize_HLTDeepCSVPF(process,ptVal=0.9): return process - +#Hello world! def customize_CaloJet(process,ptVal=0.9): #FIXME ptStr = str(ptVal).replace(".","p") From 10979e5223c3b30bf4b1acce40ca031e63c9b561 Mon Sep 17 00:00:00 2001 From: Wesley Terrill Date: Tue, 30 Jun 2020 17:56:17 +0200 Subject: [PATCH 05/11] add ptVal to ptMin calls in CaloJet --- python/customise.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/customise.py b/python/customise.py index 147a3b68425..daf14a3617f 100644 --- a/python/customise.py +++ b/python/customise.py @@ -178,11 +178,11 @@ def customize_CaloJet(process,ptVal=0.9): #FIXME max_pT = cms.double(500.0), max_pT_dRcut = cms.double(0.1), max_pT_trackPTcut = cms.double(3.0), - min_pT = cms.double(120.0), + min_pT = cms.double(120.0), #difference between this and ptMin min_pT_dRcut = cms.double(0.5), normChi2Max = cms.double(99999.9), pixelHitsMin = cms.uint32(0), - ptMin = cms.double(0.0), + ptMin = cms.double(ptVal), #correct placement? qualityClass = cms.string('any'), sip2dSigMax = cms.double(99999.9), sip2dSigMin = cms.double(2.0), @@ -206,11 +206,11 @@ def customize_CaloJet(process,ptVal=0.9): #FIXME max_pT = cms.double(500.0), max_pT_dRcut = cms.double(0.1), max_pT_trackPTcut = cms.double(3.0), - min_pT = cms.double(120.0), + min_pT = cms.double(120.0), #difference between this and ptMin min_pT_dRcut = cms.double(0.5), normChi2Max = cms.double(99999.9), pixelHitsMin = cms.uint32(0), - ptMin = cms.double(0.0), + ptMin = cms.double(ptVal), #correct placement? qualityClass = cms.string('any'), sip2dSigMax = cms.double(99999.9), sip2dSigMin = cms.double(-99999.9), From cd42b9ccbe98daf47b773948201d1f668de8dd80 Mon Sep 17 00:00:00 2001 From: Wesley Terrill Date: Tue, 30 Jun 2020 23:03:30 +0200 Subject: [PATCH 06/11] Rewrote CaloJet Pt cut function --- python/customise.py | 147 ++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 82 deletions(-) diff --git a/python/customise.py b/python/customise.py index daf14a3617f..75243dbc79a 100644 --- a/python/customise.py +++ b/python/customise.py @@ -151,92 +151,75 @@ def customize_CaloJet(process,ptVal=0.9): #FIXME ptStr = str(ptVal).replace(".","p") - setattr(process,"hltDeepCombinedSecondaryVertexBJetTagsInfosCalo"+ptStr, - cms.EDProducer("TrackDeepNNTagInfoProducer", - computer = cms.PSet( - SoftLeptonFlip = cms.bool(False), - charmCut = cms.double(1.5), - correctVertexMass = cms.bool(True), - minimumTrackWeight = cms.double(0.5), - pseudoMultiplicityMin = cms.uint32(2), - pseudoVertexV0Filter = cms.PSet( - k0sMassWindow = cms.double(0.05) - ), - trackFlip = cms.bool(False), - trackMultiplicityMin = cms.uint32(2), - trackPairV0Filter = cms.PSet( - k0sMassWindow = cms.double(0.03) - ), - trackPseudoSelection = cms.PSet( - a_dR = cms.double(-0.001053), - a_pT = cms.double(0.005263), - b_dR = cms.double(0.6263), - b_pT = cms.double(0.3684), - jetDeltaRMax = cms.double(0.3), - maxDecayLen = cms.double(5.0), - maxDistToAxis = cms.double(0.07), - max_pT = cms.double(500.0), - max_pT_dRcut = cms.double(0.1), - max_pT_trackPTcut = cms.double(3.0), - min_pT = cms.double(120.0), #difference between this and ptMin - min_pT_dRcut = cms.double(0.5), - normChi2Max = cms.double(99999.9), - pixelHitsMin = cms.uint32(0), - ptMin = cms.double(ptVal), #correct placement? - qualityClass = cms.string('any'), - sip2dSigMax = cms.double(99999.9), - sip2dSigMin = cms.double(2.0), - sip2dValMax = cms.double(99999.9), - sip2dValMin = cms.double(-99999.9), - sip3dSigMax = cms.double(99999.9), - sip3dSigMin = cms.double(-99999.9), - sip3dValMax = cms.double(99999.9), - sip3dValMin = cms.double(-99999.9), - totalHitsMin = cms.uint32(0), - useVariableJTA = cms.bool(False) - ), - trackSelection = cms.PSet( - a_dR = cms.double(-0.001053), - a_pT = cms.double(0.005263), - b_dR = cms.double(0.6263), - b_pT = cms.double(0.3684), - jetDeltaRMax = cms.double(0.3), - maxDecayLen = cms.double(5.0), - maxDistToAxis = cms.double(0.07), - max_pT = cms.double(500.0), - max_pT_dRcut = cms.double(0.1), - max_pT_trackPTcut = cms.double(3.0), - min_pT = cms.double(120.0), #difference between this and ptMin - min_pT_dRcut = cms.double(0.5), - normChi2Max = cms.double(99999.9), - pixelHitsMin = cms.uint32(0), - ptMin = cms.double(ptVal), #correct placement? - qualityClass = cms.string('any'), - sip2dSigMax = cms.double(99999.9), - sip2dSigMin = cms.double(-99999.9), - sip2dValMax = cms.double(99999.9), - sip2dValMin = cms.double(-99999.9), - sip3dSigMax = cms.double(99999.9), - sip3dSigMin = cms.double(-99999.9), - sip3dValMax = cms.double(99999.9), - sip3dValMin = cms.double(-99999.9), - totalHitsMin = cms.uint32(0), - useVariableJTA = cms.bool(False) - ), - trackSort = cms.string('sip2dSig'), - useTrackWeights = cms.bool(True), - vertexFlip = cms.bool(False) - ), - svTagInfos=cms.InputTag("hltInclusiveSecondaryVertexFinderTagInfos") + setattr(process, "hltImpactParameterTagInfosPtCut" + ptStr, + cms.EDProducer("TrackIPProducer", + computeGhostTrack = cms.bool(True), + computeProbabilities = cms.bool(True), + ghostTrackPriorDeltaR = cms.double(0.03), + jetDirectionUsingGhostTrack = cms.bool(False), + jetDirectionUsingTracks = cms.bool(False), + jetTracks = cms.InputTag("hltFastPixelBLifetimeL3Associator"), + maximumChiSquared = cms.double(5.0), + maximumLongitudinalImpactParameter = cms.double(17.0), + maximumTransverseImpactParameter = cms.double(0.2), + minimumNumberOfHits = cms.int32(3), + minimumNumberOfPixelHits = cms.int32(2), + minimumTransverseMomentum = cms.double(ptVal), + primaryVertex = cms.InputTag("hltVerticesL3","WithBS"), + useTrackQuality = cms.bool(False) ) - ) + ) - process.hltDeepCombinedSecondaryVertexBJetTagsCalo.src = "hltDeepCombinedSecondaryVertexBJetTagsInfosCalo"+ptStr + process.hltInclusiveSecondaryVertexFinderTagInfos.trackIPTagInfos = "hltImpactParameterTagInfos" + ptStr process.HLTBtagDeepCSVSequenceL3.replace( - process.hltDeepCombinedSecondaryVertexBJetTagsInfosCalo, - getattr(process,"hltDeepCombinedSecondaryVertexBJetTagsInfosCalo"+ptStr) - ) + process.hltImpactParameterTagInfos, + getattr(process, "hltImpactParameterTagInfosPtCut" + ptStr) + ) + + setattr(process, "hltInclusiveVertexFinderPtCut" + ptStr, + cms.EDProducer("InclusiveVertexFinder", + beamSpot = cms.InputTag("hltOnlineBeamSpot"), + clusterizer = cms.PSet( + clusterMaxDistance = cms.double(0.05), + clusterMaxSignificance = cms.double(4.5), + clusterMinAngleCosine = cms.double(0.5), + distanceRatio = cms.double(20.0), + seedMax3DIPSignificance = cms.double(9999.0), + seedMax3DIPValue = cms.double(9999.0), + seedMin3DIPSignificance = cms.double(1.2), + seedMin3DIPValue = cms.double(0.005) + ), + fitterRatio = cms.double(0.25), + fitterSigmacut = cms.double(3.0), + fitterTini = cms.double(256.0), + maxNTracks = cms.uint32(30), + maximumLongitudinalImpactParameter = cms.double(0.3), + maximumTimeSignificance = cms.double(3.0), + minHits = cms.uint32(8), + minPt = cms.double(ptVal), #original 0.8 + primaryVertices = cms.InputTag("hltVerticesL3"), + tracks = cms.InputTag("hltMergedTracksForBTag"), + useDirectVertexFitter = cms.bool(True), + useVertexReco = cms.bool(True), + vertexMinAngleCosine = cms.double(0.95), + vertexMinDLen2DSig = cms.double(2.5), + vertexMinDLenSig = cms.double(0.5), + vertexReco = cms.PSet( + finder = cms.string('avr'), + primcut = cms.double(1.0), + seccut = cms.double(3.0), + smoothing = cms.bool(True) + ) + ) + ) + + process.hltInclusiveSecondaryVertices.secondaryVertices = "hltInclusiveVertexFinder" + ptStr + + process.HLTBtagDeepCSVSequenceL3.replace( + process.hltInclusiveVertexFinder, + getattr(process,"hltInclusiveVertexFinderPtCut"+ptStr) + ) return process From ab26ae51ea34d976c2e5993200aadf01f28c2056 Mon Sep 17 00:00:00 2001 From: Wesley Terrill Date: Thu, 2 Jul 2020 20:00:58 +0200 Subject: [PATCH 07/11] altered runHLTBTagAnalyzer file for calojet --- test/runHLTBTagAnalyzer_cfg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/runHLTBTagAnalyzer_cfg.py b/test/runHLTBTagAnalyzer_cfg.py index 8bf9ff4ba03..c0053ae2aff 100644 --- a/test/runHLTBTagAnalyzer_cfg.py +++ b/test/runHLTBTagAnalyzer_cfg.py @@ -8543,7 +8543,7 @@ ) -process.hltDeepCombinedSecondaryVertexBJetTagsInfosCalo = cms.EDProducer("TrackDeepNNTagInfoProducer", +process.hltDeepCombinedSecondaryVertexBJetTagsInfosCalo = cms.EDProducer("TrackDeepNNTagInfoProducer", #check this computer = cms.PSet( SoftLeptonFlip = cms.bool(False), charmCut = cms.double(1.5), @@ -22741,7 +22741,7 @@ process.noFilter_CaloDeepCSV = cms.Path(process.HLTBeginSequence+process.hltPrenoFilterCaloDeepCSV+process.HLTAK4CaloJetsSequence+process.HLTBtagDeepCSVSequenceL3+process.HLTEndSequence) - +#HELLO CaloDeepCSV @@ -23091,7 +23091,7 @@ process = customize_HLTDeepCSVPF(process,options.trackPtSeed) from RecoBTag.PerformanceMeasurements.customise import customize_CaloJet -process = customize_CaloJet(process, options.trackPtSeed) +process = customize_CaloJet(process,options.trackPtSeed) ## Define analyzer sequence process.analyzerSeq = cms.Sequence( ) From ed3ac11002edbc7cee23f86ea2f17516d41f7b60 Mon Sep 17 00:00:00 2001 From: Wesley Terrill Date: Thu, 9 Jul 2020 21:09:22 +0200 Subject: [PATCH 08/11] optional trigger change added --- plugins/BTagHLTAnalyzer.cc | 12 +++++++--- python/bTagAnalyzerHLT_cfi.py | 43 ++++++++++++++++++++-------------- python/customise.py | 27 ++++++++++++++++++--- test/runHLTBTagAnalyzer_cfg.py | 14 ++++++++++- 4 files changed, 71 insertions(+), 25 deletions(-) diff --git a/plugins/BTagHLTAnalyzer.cc b/plugins/BTagHLTAnalyzer.cc index c666deb4b03..019ea89eddd 100644 --- a/plugins/BTagHLTAnalyzer.cc +++ b/plugins/BTagHLTAnalyzer.cc @@ -460,9 +460,15 @@ void BTagHLTAnalyzerT::analyze(const edm::Event& iEvent, const edm::Ev if ( !foundNames ) edm::LogError("TriggerNamesNotFound") << "Could not get trigger names!"; if ( trigRes->size() != triggerList.size() ) edm::LogError("TriggerPathLengthMismatch") << "Length of names and paths not the same: " << triggerList.size() << "," << trigRes->size() ; - - bool passTrig = processTrig(trigRes, triggerList); - if(!passTrig) return; + + //FIXME check if passes trigger + //cout << "c++ passTrig" << endl; + //bool passTrig = processTrig(trigRes, triggerList); + if(!passTrig){ + //cout << "Error, failed TRIG"< Date: Thu, 9 Jul 2020 21:13:32 +0200 Subject: [PATCH 09/11] removed unused function associated with trigger change --- python/customise.py | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/python/customise.py b/python/customise.py index 61468fd3146..3fe3de5eee5 100644 --- a/python/customise.py +++ b/python/customise.py @@ -225,25 +225,4 @@ def customize_CaloJet(process,ptVal=0.9): #FIXME return process -#def bTagHLTAnalyzer_custom(): -# -#bTagHLTAnalyzer = cms.EDAnalyzer("BTagHLTAnalyzer", -# bTagAnalyzerCommon, -# variableSet, -# groupSet, -# HLTprimaryVertexColl = cms.InputTag('hltVerticesPFFilter'), -# CaloJets = cms.InputTag('hltAK4CaloJetsCorrectedIDPassed'), -# CaloJetTags = cms.InputTag('hltDeepCombinedSecondaryVertexBJetTagsInfosCalo'), -# CaloSVs = cms.InputTag('hltInclusiveSecondaryVertexFinderTagInfos'), -# CaloJetCSVTags = cms.InputTag('hltCombinedSecondaryVertexBJetTagsCalo'), -# CaloJetDeepCSVTags = cms.InputTag('hltDeepCombinedSecondaryVertexBJetTagsCalo:probb'), -# PFJets = cms.InputTag('hltAK4PFJetsLooseIDCorrected'), -# PFJetTags = cms.InputTag('hltDeepCombinedSecondaryVertexBJetTagsInfos'), -# PFSVs = cms.InputTag('hltDeepSecondaryVertexTagInfosPF'), -# PFJetCSVTags = cms.InputTag('hltCombinedSecondaryVertexBJetTagsPF'), -# PFJetDeepCSVTags = cms.InputTag('hltDeepCombinedSecondaryVertexBJetTagsPF:probb'), -# HLTTriggerPathNames = cms.vstring("HLT_ZeroBias_Beamspot_v*"), -# # "HLT_Mu12_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_Is -# # "HLT_Mu23_TrkIsoVVL_Ele12_CaloIdL_TrackIdL_IsoVL_*"), #edit here FIXME -#) -# + From 936407b1127af253658d7191c9b41124783690d2 Mon Sep 17 00:00:00 2001 From: Wesley Terrill Date: Thu, 9 Jul 2020 21:19:01 +0200 Subject: [PATCH 10/11] cleaned up comments and unused lines --- plugins/BTagHLTAnalyzer.cc | 3 +-- python/bTagAnalyzerHLT_cfi.py | 3 --- test/runHLTBTagAnalyzer_cfg.py | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/BTagHLTAnalyzer.cc b/plugins/BTagHLTAnalyzer.cc index 019ea89eddd..5d9ff1cb1a3 100644 --- a/plugins/BTagHLTAnalyzer.cc +++ b/plugins/BTagHLTAnalyzer.cc @@ -461,8 +461,7 @@ void BTagHLTAnalyzerT::analyze(const edm::Event& iEvent, const edm::Ev if ( trigRes->size() != triggerList.size() ) edm::LogError("TriggerPathLengthMismatch") << "Length of names and paths not the same: " << triggerList.size() << "," << trigRes->size() ; - //FIXME check if passes trigger - //cout << "c++ passTrig" << endl; + //debug: check if passes trigger //bool passTrig = processTrig(trigRes, triggerList); if(!passTrig){ //cout << "Error, failed TRIG"< Date: Wed, 9 Sep 2020 21:09:45 +0200 Subject: [PATCH 11/11] clean up customization --- python/customise.py | 2 +- test/submit_allHLTMC.sh | 83 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/python/customise.py b/python/customise.py index 3fe3de5eee5..8bc4042fd3d 100644 --- a/python/customise.py +++ b/python/customise.py @@ -147,7 +147,7 @@ def customize_HLTDeepCSVPF(process,ptVal=0.9): return process #Hello world! -def customize_CaloJet(process,ptVal=0.9): #FIXME +def customize_CaloJet(process,ptVal=0.9): ptStr = str(ptVal).replace(".","p") diff --git a/test/submit_allHLTMC.sh b/test/submit_allHLTMC.sh index fa02f4691a8..7eb435057af 100644 --- a/test/submit_allHLTMC.sh +++ b/test/submit_allHLTMC.sh @@ -1,10 +1,87 @@ #!/bin/bash +cmsenv +#voms-proxy-init -rfc -voms cms -valid 192:00 +source /cvmfs/cms.cern.ch/crab3/crab.sh + echo "!!!! WARNING: Submitting for MC!!!" python submit_allHLT.py \ runHLTBTagAnalyzer_cfg.py \ -f CRAB/tosubmit_MC.txt \ -s T3_US_FNALLPC \ - -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=2.0 \ - -o /store/user/johnda/BTagNTuples/Run3/ \ - -v crab_projects_run3_trackPt2p0 + -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=0.4 trigNames="HLT_ZeroBias_Beamspot_v*"\ + -o /store/user/wterrill/BTagNTuples/Run3/ \ + -v crab_projects_run3_trackPt0p4_trigChange + +#echo "!!!! WARNING: Submitting for MC!!!" +#python submit_allHLT.py \ +# runHLTBTagAnalyzer_cfg.py \ +# -f CRAB/tosubmit_MC.txt \ +# -s T3_US_FNALLPC \ +# -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=0.9 trigNames="HLT_ZeroBias_Beamspot_v*"\ +# -o /store/user/wterrill/BTagNTuples/Run3/ \ +# -v crab_projects_run3_trackPt0p9_trigChange +# +#echo "!!!! WARNING: Submitting for MC!!!" +#python submit_allHLT.py \ +# runHLTBTagAnalyzer_cfg.py \ +# -f CRAB/tosubmit_MC.txt \ +# -s T3_US_FNALLPC \ +# -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=1.5 trigNames="HLT_ZeroBias_Beamspot_v*"\ +# -o /store/user/wterrill/BTagNTuples/Run3/ \ +# -v crab_projects_run3_trackPt1p5_trigChange +# +#echo "!!!! WARNING: Submitting for MC!!!" +#python submit_allHLT.py \ +# runHLTBTagAnalyzer_cfg.py \ +# -f CRAB/tosubmit_MC.txt \ +# -s T3_US_FNALLPC \ +# -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=2.0 trigNames="HLT_ZeroBias_Beamspot_v*"\ +# -o /store/user/wterrill/BTagNTuples/Run3/ \ +# -v crab_projects_run3_trackPt2p0_trigChange +# +#echo "!!!! WARNING: Submitting for MC!!!" +#python submit_allHLT.py \ +# runHLTBTagAnalyzer_cfg.py \ +# -f CRAB/tosubmit_MC.txt \ +# -s T3_US_FNALLPC \ +# -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=2.5 trigNames="HLT_ZeroBias_Beamspot_v*"\ +# -o /store/user/wterrill/BTagNTuples/Run3/ \ +# -v crab_projects_run3_trackPt2p5_trigChange +# +#echo "!!!! WARNING: Submitting for MC!!!" +#python submit_allHLT.py \ +# runHLTBTagAnalyzer_cfg.py \ +# -f CRAB/tosubmit_MC.txt \ +# -s T3_US_FNALLPC \ +# -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=5.0 trigNames="HLT_ZeroBias_Beamspot_v*"\ +# -o /store/user/wterrill/BTagNTuples/Run3/ \ +# -v crab_projects_run3_trackPt5p0_trigChange +# +#echo "!!!! WARNING: Submitting for MC!!!" +#python submit_allHLT.py \ +# runHLTBTagAnalyzer_cfg.py \ +# -f CRAB/tosubmit_MC.txt \ +# -s T3_US_FNALLPC \ +# -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=7.5 trigNames="HLT_ZeroBias_Beamspot_v*"\ +# -o /store/user/wterrill/BTagNTuples/Run3/ \ +# -v crab_projects_run3_trackPt7p5_trigChange +# +#echo "!!!! WARNING: Submitting for MC!!!" +#python submit_allHLT.py \ +# runHLTBTagAnalyzer_cfg.py \ +# -f CRAB/tosubmit_MC.txt \ +# -s T3_US_FNALLPC \ +# -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=10.0 trigNames="HLT_ZeroBias_Beamspot_v*"\ +# -o /store/user/wterrill/BTagNTuples/Run3/ \ +# -v crab_projects_run3_trackPt10p0_trigChange +# +#echo "!!!! WARNING: Submitting for MC!!!" +#python submit_allHLT.py \ +# runHLTBTagAnalyzer_cfg.py \ +# -f CRAB/tosubmit_MC.txt \ +# -s T3_US_FNALLPC \ +# -p groups="HLTEventInfo,HLTJetInfo,HLTTagVar,HLTJetTrack,HLTJetSV,HLTCSVTagVar" runOnData=False globalTag="110X_mcRun3_2021_realistic_v6" trackPtSeed=20.0 trigNames="HLT_ZeroBias_Beamspot_v*"\ +# -o /store/user/wterrill/BTagNTuples/Run3/ \ +# -v crab_projects_run3_trackPt20p0_trigChange +#