Skip to content

PPS: add Run-3 reco, add geometry to GTs, update era modifier #33415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 12 commits into from
Apr 13, 2021
Merged

PPS: add Run-3 reco, add geometry to GTs, update era modifier #33415

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7b10f04
add ctpps era modifier
jan-kaspar Mar 19, 2021
2da85c9
update mapping between ctpps modifiers and Run2_20XY chains
jan-kaspar Mar 19, 2021
518d281
replace ctpps_2016 with ctpps modifier, where desirable
jan-kaspar Mar 19, 2021
ae7170c
re-enable pps reco in run3
silviodonato Mar 25, 2021
f35acf8
Add PPS geometry and simulation tags to GTs
malbouis Apr 11, 2021
185cd0e
Merged alca-PPStags from repository malbouis with cms-merge-topic
silviodonato Apr 12, 2021
9796ddb
Merged reenablePPSrun3 from repository silviodonato with cms-merge-topic
silviodonato Apr 12, 2021
c602a7e
Merged pps_era_modifiers from repository CTPPS with cms-merge-topic
silviodonato Apr 12, 2021
440b14c
use CTPPSRun2Geometry customization to fix HLT test with Run2 data
silviodonato Apr 12, 2021
489682b
fix in CTPPSRun2Geometry cust funt
silviodonato Apr 13, 2021
df58d05
fix in CTPPSRun2Geometry cust funt
silviodonato Apr 13, 2021
d7a53f4
fix HLT addOnTest to use CTPPSRun2Geometry custom funct
silviodonato Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Configuration/AlCa/python/autoCond.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@
# GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in PEAK mode
'phase1_2018_cosmics_peak' : '113X_upgrade2018cosmics_realistic_peak_v4',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2021
'phase1_2021_design' : '113X_mcRun3_2021_design_v6', # GT containing design conditions for Phase1 2021
'phase1_2021_design' : '113X_mcRun3_2021_design_v7', # GT containing design conditions for Phase1 2021
# GlobalTag for MC production with realistic conditions for Phase1 2021
'phase1_2021_realistic' : '113X_mcRun3_2021_realistic_v8', # GT containing realistic conditions for Phase1 2021
'phase1_2021_realistic' : '113X_mcRun3_2021_realistic_v9', # GT containing realistic conditions for Phase1 2021
# GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2021, Strip tracker in DECO mode
'phase1_2021_cosmics' : '113X_mcRun3_2021cosmics_realistic_deco_v7',
'phase1_2021_cosmics' : '113X_mcRun3_2021cosmics_realistic_deco_v8',
# GlobalTag for MC production with realistic conditions for Phase1 2021 detector for Heavy Ion
'phase1_2021_realistic_hi' : '113X_mcRun3_2021_realistic_HI_v6',
'phase1_2021_realistic_hi' : '113X_mcRun3_2021_realistic_HI_v7',
# GlobalTag for MC production with realistic conditions for Phase1 2023
'phase1_2023_realistic' : '113X_mcRun3_2023_realistic_v6', # GT containing realistic conditions for Phase1 2023
'phase1_2023_realistic' : '113X_mcRun3_2023_realistic_v7', # GT containing realistic conditions for Phase1 2023
# GlobalTag for MC production with realistic conditions for Phase1 2024
'phase1_2024_realistic' : '113X_mcRun3_2024_realistic_v6', # GT containing realistic conditions for Phase1 2024
'phase1_2024_realistic' : '113X_mcRun3_2024_realistic_v7', # GT containing realistic conditions for Phase1 2024
# GlobalTag for MC production with realistic conditions for Phase2
'phase2_realistic' : '113X_mcRun4_realistic_v6'
}
Expand Down
3 changes: 2 additions & 1 deletion Configuration/Eras/python/Era_Run2_2016_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from Configuration.Eras.Modifier_run2_common_cff import run2_common
from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
from Configuration.Eras.Modifier_ctpps_cff import ctpps
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
from Configuration.Eras.Modifier_run2_HLTconditions_2016_cff import run2_HLTconditions_2016
from Configuration.Eras.Modifier_run2_muon_2016_cff import run2_muon_2016
Expand All @@ -14,5 +15,5 @@
from Configuration.Eras.Modifier_run2_ECAL_2016_cff import run2_ECAL_2016

Run2_2016 = cms.ModifierChain(run2_common, run2_25ns_specific,
stage2L1Trigger, ctpps_2016, run2_HLTconditions_2016, run2_ECAL_2016, run2_muon_2016, run2_egamma_2016, run2_L1prefiring, pixel_2016, run2_jme_2016, strips_vfp30_2016)
stage2L1Trigger, ctpps, ctpps_2016, run2_HLTconditions_2016, run2_ECAL_2016, run2_muon_2016, run2_egamma_2016, run2_L1prefiring, pixel_2016, run2_jme_2016, strips_vfp30_2016)

3 changes: 2 additions & 1 deletion Configuration/Eras/python/Era_Run2_2017_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
from Configuration.Eras.Modifier_run2_muon_2016_cff import run2_muon_2016
from Configuration.Eras.Modifier_run2_egamma_2017_cff import run2_egamma_2017
from Configuration.Eras.Modifier_run2_egamma_2016_cff import run2_egamma_2016
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
from Configuration.Eras.Modifier_pixel_2016_cff import pixel_2016
from Configuration.Eras.Modifier_run2_jme_2017_cff import run2_jme_2017
from Configuration.Eras.Modifier_run2_jme_2016_cff import run2_jme_2016
from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016

Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016, run2_HLTconditions_2016, run2_ECAL_2016, run2_egamma_2016,pixel_2016,run2_jme_2016, strips_vfp30_2016]),
Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016, run2_HLTconditions_2016, run2_ECAL_2016, run2_egamma_2016,pixel_2016,run2_jme_2016, strips_vfp30_2016, ctpps_2016]),
phase1Pixel, run2_ECAL_2017, run2_HF_2017, run2_HCAL_2017, run2_HE_2017, run2_HEPlan1_2017,
trackingPhase1, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017, run2_muon_2017,run2_egamma_2017, ctpps_2017, run2_jme_2017)

4 changes: 4 additions & 0 deletions Configuration/Eras/python/Modifier_ctpps_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

ctpps = cms.Modifier()

8 changes: 4 additions & 4 deletions Configuration/EventContent/python/EventContent_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def SwapKeepAndDrop(l):
RECOEventContent.outputCommands.extend(CommonEventContent.outputCommands)
RECOEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
from Configuration.Eras.Modifier_ctpps_cff import ctpps
from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
Expand All @@ -223,7 +223,7 @@ def SwapKeepAndDrop(l):
from RecoLocalFastTime.Configuration.RecoLocalFastTime_EventContent_cff import *
from RecoMTD.Configuration.RecoMTD_EventContent_cff import *

ctpps_2016.toModify(RECOEventContent,
ctpps.toModify(RECOEventContent,
outputCommands = RECOEventContent.outputCommands + RecoCTPPSRECO.outputCommands)
phase2_hgcal.toModify(RECOEventContent,
outputCommands = RECOEventContent.outputCommands + TICL_RECO.outputCommands)
Expand Down Expand Up @@ -276,7 +276,7 @@ def SwapKeepAndDrop(l):
AODEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
AODEventContent.outputCommands.extend(CommonEventContent.outputCommands)

ctpps_2016.toModify(AODEventContent,
ctpps.toModify(AODEventContent,
outputCommands = AODEventContent.outputCommands + RecoCTPPSAOD.outputCommands)
phase2_hgcal.toModify(AODEventContent,
outputCommands = AODEventContent.outputCommands + TICL_AOD.outputCommands)
Expand Down Expand Up @@ -486,7 +486,7 @@ def SwapKeepAndDrop(l):
FEVTEventContent.outputCommands.extend(CommonEventContent.outputCommands)
FEVTEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)

ctpps_2016.toModify(FEVTEventContent,
ctpps.toModify(FEVTEventContent,
outputCommands = FEVTEventContent.outputCommands + RecoCTPPSFEVT.outputCommands)
phase2_hgcal.toModify(FEVTEventContent,
outputCommands = FEVTEventContent.outputCommands + TICL_FEVT.outputCommands)
Expand Down
2 changes: 1 addition & 1 deletion Configuration/StandardSequences/python/Eras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def __init__(self):
'phase2_timing_layer', 'phase2_etlV4', 'phase2_hcal', 'phase2_ecal','phase2_ecal_devel',
'phase2_trigger',
'phase2_squarePixels', 'phase2_3DPixels',
'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018',
'trackingLowPU', 'trackingPhase1', 'ctpps', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018',
'tracker_apv_vfp30_2016', 'pf_badHcalMitigation', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X',
'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'run2_nanoAOD_94X2016',
'run2_miniAOD_devel', 'run2_nanoAOD_102Xv1', 'run2_nanoAOD_106Xv1', 'run2_nanoAOD_106Xv2',
Expand Down
14 changes: 7 additions & 7 deletions Configuration/StandardSequences/python/RawToDigi_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@


# add CTPPS 2016 raw-to-digi modules
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
from Configuration.Eras.Modifier_ctpps_cff import ctpps

_ctpps_2016_RawToDigiTask = RawToDigiTask.copy()
_ctpps_2016_RawToDigiTask.add(ctppsRawToDigiTask)
ctpps_2016.toReplaceWith(RawToDigiTask, _ctpps_2016_RawToDigiTask)
_ctpps_RawToDigiTask = RawToDigiTask.copy()
_ctpps_RawToDigiTask.add(ctppsRawToDigiTask)
ctpps.toReplaceWith(RawToDigiTask, _ctpps_RawToDigiTask)

_ctpps_2016_RawToDigiTask_noTk = RawToDigiTask_noTk.copy()
_ctpps_2016_RawToDigiTask_noTk.add(ctppsRawToDigiTask)
ctpps_2016.toReplaceWith(RawToDigiTask_noTk, _ctpps_2016_RawToDigiTask_noTk)
_ctpps_RawToDigiTask_noTk = RawToDigiTask_noTk.copy()
_ctpps_RawToDigiTask_noTk.add(ctppsRawToDigiTask)
ctpps.toReplaceWith(RawToDigiTask_noTk, _ctpps_RawToDigiTask_noTk)

# GEM settings
_gem_RawToDigiTask = RawToDigiTask.copy()
Expand Down
17 changes: 9 additions & 8 deletions Configuration/StandardSequences/python/Reconstruction_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,15 @@
phase2_timing_layer.toReplaceWith(localrecoTask,_phase2_timing_layer_localrecoTask)
phase2_timing_layer.toReplaceWith(localreco_HcalNZSTask,_phase2_timing_layer_localreco_HcalNZSTask)

_ctpps_2016_localrecoTask = localrecoTask.copy()
_ctpps_2016_localrecoTask.add(recoCTPPSTask)
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
ctpps_2016.toReplaceWith(localrecoTask, _ctpps_2016_localrecoTask)

_ctpps_2016_localreco_HcalNZSTask = localreco_HcalNZSTask.copy()
_ctpps_2016_localreco_HcalNZSTask.add(recoCTPPSTask)
ctpps_2016.toReplaceWith(localreco_HcalNZSTask, _ctpps_2016_localreco_HcalNZSTask)
from Configuration.Eras.Modifier_ctpps_cff import ctpps

_ctpps_localrecoTask = localrecoTask.copy()
_ctpps_localrecoTask.add(recoCTPPSTask)
ctpps.toReplaceWith(localrecoTask, _ctpps_localrecoTask)

_ctpps_localreco_HcalNZSTask = localreco_HcalNZSTask.copy()
_ctpps_localreco_HcalNZSTask.add(recoCTPPSTask)
ctpps.toReplaceWith(localreco_HcalNZSTask, _ctpps_localreco_HcalNZSTask)

###########################################
# no castor, zdc, Totem/CTPPS RP in FastSim
Expand Down
14 changes: 7 additions & 7 deletions DQM/CTPPS/python/ctppsDQM_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@
)

# the actually used sequences must be empty for pre-PPS data
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
from Configuration.Eras.Modifier_ctpps_cff import ctpps

ctppsDQMOnlineSource = cms.Sequence()
ctppsDQMOnlineHarvest = cms.Sequence()
ctpps_2016.toReplaceWith(ctppsDQMOnlineSource, _ctppsDQMOnlineSource)
ctpps_2016.toReplaceWith(ctppsDQMOnlineHarvest, _ctppsDQMOnlineHarvest)
ctpps.toReplaceWith(ctppsDQMOnlineSource, _ctppsDQMOnlineSource)
ctpps.toReplaceWith(ctppsDQMOnlineHarvest, _ctppsDQMOnlineHarvest)

ctppsDQMCalibrationSource = cms.Sequence()
ctppsDQMCalibrationHarvest = cms.Sequence()
ctpps_2016.toReplaceWith(ctppsDQMCalibrationSource, _ctppsDQMCalibrationSource)
ctpps_2016.toReplaceWith(ctppsDQMCalibrationHarvest, _ctppsDQMCalibrationHarvest)
ctpps.toReplaceWith(ctppsDQMCalibrationSource, _ctppsDQMCalibrationSource)
ctpps.toReplaceWith(ctppsDQMCalibrationHarvest, _ctppsDQMCalibrationHarvest)

ctppsDQMOfflineSource = cms.Sequence()
ctppsDQMOfflineHarvest = cms.Sequence()
ctpps_2016.toReplaceWith(ctppsDQMOfflineSource, _ctppsDQMOfflineSource)
ctpps_2016.toReplaceWith(ctppsDQMOfflineHarvest, _ctppsDQMOfflineHarvest)
ctpps.toReplaceWith(ctppsDQMOfflineSource, _ctppsDQMOfflineSource)
ctpps.toReplaceWith(ctppsDQMOfflineHarvest, _ctppsDQMOfflineHarvest)
4 changes: 2 additions & 2 deletions DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
process = cms.Process('ctppsDQMfromAOD', ctpps_2016)
from Configuration.Eras.Modifier_ctpps_cff import ctpps
process = cms.Process('ctppsDQMfromAOD', ctpps)

# minimum of logs
process.MessageLogger = cms.Service("MessageLogger",
Expand Down
4 changes: 2 additions & 2 deletions DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
process = cms.Process('ctppsDQMfromRAW', ctpps_2016)
from Configuration.Eras.Modifier_ctpps_cff import ctpps
process = cms.Process('ctppsDQMfromRAW', ctpps)

# minimum of logs
process.MessageLogger = cms.Service("MessageLogger",
Expand Down
4 changes: 2 additions & 2 deletions DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
process = cms.Process('ctppsDQMfromRAW', ctpps_2016)
from Configuration.Eras.Modifier_ctpps_cff import ctpps
process = cms.Process('ctppsDQMfromRAW', ctpps)

# minimum of logs
process.MessageLogger = cms.Service("MessageLogger",
Expand Down
5 changes: 5 additions & 0 deletions HLTrigger/Configuration/python/CustomConfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,3 +200,8 @@ def L1XML(process,xmlFile=None):
process.ESPreferL1TXML = cms.ESPrefer("L1TUtmTriggerMenuESProducer","L1TriggerMenu")

return process

def CTPPSRun2Geometry(process):
if hasattr(process,'ctppsGeometryESModule')
Copy link
Contributor

@forthommel forthommel Apr 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if hasattr(process,'ctppsGeometryESModule')
if hasattr(process,'ctppsGeometryESModule'):

Copy link
Contributor

@christopheralanwest christopheralanwest Apr 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is also necessary to return process as well as actually use the customization. Using the commit at 1364f26 on top of this PR allows the following to complete without errors in a local test:

  • runTheMatrix.py -l 11725.0,11925.0,limited --ibeos
  • addOnTests -j 8

Copy link
Contributor Author

@silviodonato silviodonato Apr 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thansk @forthommel @christopheralanwest .
@Martin-Grunewald is Configuration/HLT/python/addOnTestsHLT.py automatically generated from HLTrigger/Configuration/test/cmsDriver.csh ? Do we need to change both manually?

Copy link
Contributor

@Martin-Grunewald Martin-Grunewald Apr 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are separate, both need the change.

Copy link
Contributor Author

@silviodonato silviodonato Apr 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, I've added 1364f26

process.ctppsGeometryESModule.isRun2 = True

4 changes: 4 additions & 0 deletions HLTrigger/Configuration/test/cmsDriver.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ foreach gtag ( MC DATA )
continue
endif

## Force CTPPSRun2Geometry if running on Run-2 data using Run3 modifier
if ( $gtag == DATA && ( $Era == $EraRun3HI || $Era == $EraRun3pp) ) then
set Custom = "HLTrigger/Configuration/CustomConfigs.CTPPSRun2Geometry"
endif

if ( $gtag == DATA ) then

Expand Down
6 changes: 3 additions & 3 deletions PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,9 +618,9 @@ def miniAOD_customizeData(process):
process.load("Geometry.VeryForwardGeometry.geometryRPFromDB_cfi")
process.load('L1Trigger.L1TGlobal.simGtExtFakeProd_cfi')
task = getPatAlgosToolsTask(process)
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
ctpps_2016.toModify(task, func=lambda t: t.add(process.ctppsLocalTrackLiteProducer))
ctpps_2016.toModify(task, func=lambda t: t.add(process.ctppsProtons))
from Configuration.Eras.Modifier_ctpps_cff import ctpps
ctpps.toModify(task, func=lambda t: t.add(process.ctppsLocalTrackLiteProducer))
ctpps.toModify(task, func=lambda t: t.add(process.ctppsProtons))
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
run2_miniAOD_UL.toModify(task, func=lambda t: t.add(process.simGtExtUnprefireable))

Expand Down
5 changes: 0 additions & 5 deletions RecoPPS/Configuration/python/recoCTPPS_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,4 @@
ctppsProtons
)

#temporarily remove ctppsProtons in Run-3 (see issue #32340)
from Configuration.Eras.Modifier_ctpps_2021_cff import ctpps_2021
_ctpps_2021_recoCTPPSTask = recoCTPPSTask.copyAndExclude([ctppsProtons])
ctpps_2021.toReplaceWith(recoCTPPSTask, _ctpps_2021_recoCTPPSTask)

recoCTPPS = cms.Sequence(recoCTPPSTask)
4 changes: 2 additions & 2 deletions RecoPPS/Configuration/test/raw_data_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
process = cms.Process("CTPPSReconstructionChainTest", ctpps_2016)
from Configuration.Eras.Modifier_ctpps_cff import ctpps
process = cms.Process("CTPPSReconstructionChainTest", ctpps)

# minimum of logs
process.MessageLogger = cms.Service("MessageLogger",
Expand Down
2 changes: 1 addition & 1 deletion RecoPPS/Local/plugins/CTPPSLocalTrackLiteProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void CTPPSLocalTrackLiteProducer::fillDescriptions(edm::ConfigurationDescription
edm::ParameterSetDescription desc;

// By default: all includeXYZ flags set to false.
// The includeXYZ are switched on when the "ctpps_2016" era is declared in
// The includeXYZ are switched on when the "ctpps" era modifier is declared in
// python config, see:
// RecoPPS/Local/python/ctppsLocalTrackLiteProducer_cff.py

Expand Down
4 changes: 2 additions & 2 deletions RecoPPS/Local/python/ctppsLocalTrackLiteProducer_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
ctppsLocalTrackLiteProducer = ctppsLocalTrackLiteDefaultProducer.clone()

# enable the module for CTPPS era(s)
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
ctpps_2016.toModify(
from Configuration.Eras.Modifier_ctpps_cff import ctpps
ctpps.toModify(
ctppsLocalTrackLiteProducer,
includeStrips = True,
includeDiamonds = True,
Expand Down
4 changes: 2 additions & 2 deletions RecoPPS/ProtonReconstruction/python/ctppsProtons_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from RecoPPS.ProtonReconstruction.ctppsProtons_cfi import *
ctppsProtons.lhcInfoLabel = ctppsLHCInfoLabel

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
from Configuration.Eras.Modifier_ctpps_cff import ctpps
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018

Expand All @@ -34,7 +34,7 @@ def applyDefaultSettings(ctppsProtons):
ctppsProtons.pixelDiscardBXShiftedTracks = True
ctppsProtons.default_time = -999.

ctpps_2016.toModify(ctppsProtons, applyDefaultSettings) # applied for all Run2 years (2016, 2017 and 2018)
ctpps.toModify(ctppsProtons, applyDefaultSettings)

def apply2017Settings(ctppsProtons):
ctppsProtons.association_cuts_45.x_cut_apply = False
Expand Down