From 485f8df3c9b047ac21f844d9bbf3d24071454620 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Mon, 26 Jul 2021 18:29:22 +0200 Subject: [PATCH 1/2] Add a few Hcal related AlCaReco streams to HLTPhysics --- .../plugins/AlCaIsoTracksFilter.cc | 4 +-- .../test/python/isoTrackRecoAnalysis_cfg.py | 32 ++++++++++++------- Configuration/AlCa/python/autoAlca.py | 2 +- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc index 54aa336844348..c3a8ea75e6c5f 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc +++ b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc @@ -485,9 +485,9 @@ void AlCaIsoTracksFilter::fillDescriptions(edm::ConfigurationDescriptions& descr // Prescale events only containing isolated tracks in the range desc.add("momentumRangeLow", 20.0); desc.add("momentumRangeHigh", 40.0); - desc.add("preScaleFactor", 10); + desc.add("preScaleFactor", 1); desc.add("momentumHigh", 60.0); - desc.add("preScaleHigh", 2); + desc.add("preScaleHigh", 1); descriptions.add("alcaIsoTracksFilter", desc); } diff --git a/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py b/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py index 1ec99dd761a5c..8d9f11819607c 100644 --- a/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py @@ -11,13 +11,12 @@ process.load("RecoLocalCalo.EcalRecAlgos.EcalSeverityLevelESProducer_cfi") process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -from Configuration.AlCa.autoCond import autoCond -#process.GlobalTag.globaltag='101X_dataRun2_Prompt_v10' -process.GlobalTag.globaltag='106X_dataRun2_v20' -#106X_mcRun3_2021_realistic_v3 +from Configuration.AlCa.GlobalTag import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag,'auto:run2_data','') +#auto:run3_mc + if 'MessageLogger' in process.__dict__: process.MessageLogger.HcalIsoTrack=dict() - process.MessageLogger.cerr.FwkReport.reportEvery = 1 process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) @@ -32,13 +31,10 @@ process.load('Calibration.HcalCalibAlgos.HcalIsoTrkAnalyzer_cff') process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( + 'file:/eos/cms/store/group/dpg_hcal/comm_hcal/ISOTRACK/MinBias_AlcaReco_2017D_IsotrkFilter.root', #'/store/data/Run2018B/JetHT/ALCARECO/HcalCalIsoTrkFilter-PromptReco-v1/000/317/696/00000/D60EC93B-9870-E811-BAF3-FA163E8DA20D.root', -# '/store/mc/Run3Summer19DR/DoublePion_E-50/GEN-SIM-RECO/2021ScenarioNZSRECONoPU_106X_mcRun3_2021_realistic_v3-v2/270000/22481A14-0F65-E046-809A-C03709C76325.root' -# 'file:/afs/cern.ch/work/s/sdey/public/forsunandada/C2F61205-A366-E711-9AFA-02163E01A2B0.root', -# '/store/mc/Run3Summer19DRPremix/QCD_Pt-15to7000_TuneCP5_Flat_13TeV_pythia8/GEN-SIM-RECO/2021ScenarioNZSRECO_106X_mcRun3_2021_realistic_v3-v2/210000/0049D816-1F5D-C649-9D36-12A55EF44FE6.root' -# '/store/mc/Run3Summer19DRPremix/QCD_Pt-15_IsoTrkFilter_Pt-30_TuneCP5_14TeV-pythia8/GEN-SIM-RECO/2021ScenarioRECO_106X_mcRun3_2021_realistic_v3-v2/30000/9CF8F3E3-B8C7-F84A-BAF2-17AD46769E1E.root' - 'root://xrootd.ba.infn.it///store/data/Run2017E/JetHT/ALCARECO/HcalCalIsoTrkFilter-09Aug2019_UL2017-v1/50000/FF19B3B8-39D3-D941-8162-1AA7FB482D48.root' - + #'/store/mc/Run3Summer19DR/DoublePion_E-50/GEN-SIM-RECO/2021ScenarioNZSRECONoPU_106X_mcRun3_2021_realistic_v3-v2/270000/22481A14-0F65-E046-809A-C03709C76325.root' + #'root://xrootd.ba.infn.it///store/data/Run2017E/JetHT/ALCARECO/HcalCalIsoTrkFilter-09Aug2019_UL2017-v1/50000/FF19B3B8-39D3-D941-8162-1AA7FB482D48.root' ) ) @@ -61,5 +57,19 @@ #process.HcalIsoTrkAnalyzer.useRaw = 2 process.HcalIsoTrkAnalyzer.unCorrect = True +process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold1 = 0.00 +process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold2 = 0.00 +process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold3 = 0.00 +process.HcalIsoTrkAnalyzer.EEHitEnergyThresholdLow = 0.00 +# Default +#process.HcalIsoTrkAnalyzer.EBHitEnergyThreshold = 0.08 +#process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold0 = 0.30 +# Reduced +#process.HcalIsoTrkAnalyzer.EBHitEnergyThreshold = 0.08 +#process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold0 = 0.30 +# Remove +#process.HcalIsoTrkAnalyzer.EBHitEnergyThreshold = 0.00 +#process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold0 = 0.00 + process.p = cms.Path(process.HcalIsoTrkAnalyzer) diff --git a/Configuration/AlCa/python/autoAlca.py b/Configuration/AlCa/python/autoAlca.py index bed1ed97ca9d5..ab1eec7399b72 100644 --- a/Configuration/AlCa/python/autoAlca.py +++ b/Configuration/AlCa/python/autoAlca.py @@ -6,7 +6,7 @@ "DoubleMuon" : "TkAlZMuMu+TkAlDiMuonAndVertex+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+HcalCalLowPUHBHEMuonFilter", # New PD in 2018 to replace SinglePhoton SingleElectron and DoubleEG in 2017 "EGamma" : "EcalESAlign+EcalUncalWElectron+EcalUncalZElectron+HcalCalIsoTrkFilter+HcalCalIterativePhiSym", - "HLTPhysics" : "TkAlMinBias+HcalCalIterativePhiSym", + "HLTPhysics" : "TkAlMinBias+HcalCalIterativePhiSym+HcalCalIsoTrkFilter+HcalCalHO+HcalCalHBHEMuonFilter", "JetHT" : "HcalCalIsoTrkFilter+HcalCalIsolatedBunchFilter+TkAlMinBias", "MinimumBias" : "SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias", "MuOnia" : "TkAlUpsilonMuMu", From 1715b64c3056d1e3ab9482d260f1e31524ecd67d Mon Sep 17 00:00:00 2001 From: Sunanda Date: Mon, 26 Jul 2021 19:18:56 +0200 Subject: [PATCH 2/2] Remove the commented lines --- .../test/python/isoTrackRecoAnalysis_cfg.py | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py b/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py index 8d9f11819607c..b2b2b6fb6d7d0 100644 --- a/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py @@ -2,7 +2,6 @@ from Configuration.Eras.Era_Run2_2017_cff import Run2_2017 process = cms.Process("ANALYSIS",Run2_2017) -#process = cms.Process("ANALYSIS") process.load("FWCore.MessageService.MessageLogger_cfi") process.load('Configuration.StandardSequences.Services_cff') @@ -13,7 +12,6 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag,'auto:run2_data','') -#auto:run3_mc if 'MessageLogger' in process.__dict__: process.MessageLogger.HcalIsoTrack=dict() @@ -32,9 +30,6 @@ process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( 'file:/eos/cms/store/group/dpg_hcal/comm_hcal/ISOTRACK/MinBias_AlcaReco_2017D_IsotrkFilter.root', - #'/store/data/Run2018B/JetHT/ALCARECO/HcalCalIsoTrkFilter-PromptReco-v1/000/317/696/00000/D60EC93B-9870-E811-BAF3-FA163E8DA20D.root', - #'/store/mc/Run3Summer19DR/DoublePion_E-50/GEN-SIM-RECO/2021ScenarioNZSRECONoPU_106X_mcRun3_2021_realistic_v3-v2/270000/22481A14-0F65-E046-809A-C03709C76325.root' - #'root://xrootd.ba.infn.it///store/data/Run2017E/JetHT/ALCARECO/HcalCalIsoTrkFilter-09Aug2019_UL2017-v1/50000/FF19B3B8-39D3-D941-8162-1AA7FB482D48.root' ) ) @@ -44,32 +39,19 @@ fileName = cms.string('output.root') ) -#process.HcalIsoTrkAnalyzer.maxDzPV = 1.0 -#process.HcalIsoTrkAnalyzer.minOuterHit = 0 -#process.HcalIsoTrkAnalyzer.minLayerCrossed = 0 - process.HcalIsoTrkAnalyzer.triggers = [] process.HcalIsoTrkAnalyzer.oldID = [21701, 21603] process.HcalIsoTrkAnalyzer.newDepth = [2, 4] process.HcalIsoTrkAnalyzer.hep17 = True -process.HcalIsoTrkAnalyzer.dataType = 0 #0 for jetHT else 1 -#process.HcalIsoTrkAnalyzer.maximumEcalEnergy = 100 # set MIP cut -#process.HcalIsoTrkAnalyzer.useRaw = 2 +process.HcalIsoTrkAnalyzer.dataType = 0 # 0 for jetHT else 1 +process.HcalIsoTrkAnalyzer.maximumEcalEnergy = 2.0 # set MIP cut +process.HcalIsoTrkAnalyzer.useRaw = 0 # 2 for Raw process.HcalIsoTrkAnalyzer.unCorrect = True -process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold1 = 0.00 -process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold2 = 0.00 -process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold3 = 0.00 -process.HcalIsoTrkAnalyzer.EEHitEnergyThresholdLow = 0.00 -# Default -#process.HcalIsoTrkAnalyzer.EBHitEnergyThreshold = 0.08 -#process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold0 = 0.30 -# Reduced -#process.HcalIsoTrkAnalyzer.EBHitEnergyThreshold = 0.08 -#process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold0 = 0.30 -# Remove -#process.HcalIsoTrkAnalyzer.EBHitEnergyThreshold = 0.00 -#process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold0 = 0.00 +process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold1 = 0.00 # default 0.30 +process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold2 = 0.00 # coeff. of linear term +process.HcalIsoTrkAnalyzer.EEHitEnergyThreshold3 = 0.00 # coeff. of quad term +process.HcalIsoTrkAnalyzer.EEHitEnergyThresholdLow = 0.00 # minimum def 0.30 process.p = cms.Path(process.HcalIsoTrkAnalyzer)