Skip to content

[12_4_X] Put sampic subdet id behind the era modifier #38365

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 3 commits into from
Jun 15, 2022
Merged

[12_4_X] Put sampic subdet id behind the era modifier #38365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c56d86b
put sampic subdet id behind the era modifier
Jun 9, 2022
deb4a01
Make sampicSubDetId a tracked parameter
francescobrivio Jun 14, 2022
0ae485b
addi missing `sampicSubDetId` instances in the PPS cfg
francescobrivio Jun 15, 2022
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
17 changes: 10 additions & 7 deletions CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ class TotemDAQMappingESSourceXML : public edm::ESProducer, public edm::EventSetu
/// label of the CTPPS sub-system
string subSystemName;

//subdetector id for sampic
unsigned int sampicSubDetId;

/// the mapping files
std::vector<std::string> mappingFileNames;

Expand Down Expand Up @@ -245,6 +248,7 @@ const string TotemDAQMappingESSourceXML::tagTotemTimingPlane = "timing_plane";
TotemDAQMappingESSourceXML::TotemDAQMappingESSourceXML(const edm::ParameterSet &conf)
: verbosity(conf.getUntrackedParameter<unsigned int>("verbosity", 0)),
subSystemName(conf.getUntrackedParameter<string>("subSystem")),
sampicSubDetId(conf.getParameter<unsigned int>("sampicSubDetId")),
currentBlock(0),
currentBlockValid(false) {
for (const auto &it : conf.getParameter<vector<ParameterSet>>("configuration")) {
Expand Down Expand Up @@ -754,13 +758,12 @@ void TotemDAQMappingESSourceXML::ParseTreeTotemTiming(ParseType pType,
unsigned int StationNum = (parentID / 1000) % 10;
unsigned int RpNum = (parentID / 100) % 10;

vfatInfo.symbolicID.symbolicID =
TotemTimingDetId(ArmNum,
StationNum,
RpNum,
0,
TotemTimingDetId::ID_NOT_SET,
TotemTimingDetId::sdTimingDiamond); //Dynamical: it is encoded in the frame
vfatInfo.symbolicID.symbolicID = TotemTimingDetId(ArmNum,
StationNum,
RpNum,
0,
TotemTimingDetId::ID_NOT_SET,
sampicSubDetId); //Dynamical: it is encoded in the frame

mapping->insert(framepos, vfatInfo);

Expand Down
6 changes: 5 additions & 1 deletion EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
totemDAQMappingESSourceXML_TrackingStrip = cms.ESSource("TotemDAQMappingESSourceXML",
verbosity = cms.untracked.uint32(0),
subSystem = cms.untracked.string("TrackingStrip"),
sampicSubDetId = cms.uint32(6),
configuration = cms.VPSet(
# 2016, before TS2
cms.PSet(
Expand Down Expand Up @@ -62,6 +63,7 @@
totemDAQMappingESSourceXML_TimingDiamond = cms.ESSource("TotemDAQMappingESSourceXML",
verbosity = cms.untracked.uint32(0),
subSystem = cms.untracked.string("TimingDiamond"),
sampicSubDetId = cms.uint32(6),
configuration = cms.VPSet(
# 2016, before diamonds inserted in DAQ
cms.PSet(
Expand Down Expand Up @@ -102,8 +104,9 @@

# ---------- Totem Timing ----------
totemDAQMappingESSourceXML_TotemTiming = cms.ESSource("TotemDAQMappingESSourceXML",
verbosity = cms.untracked.uint32(10),
verbosity = cms.untracked.uint32(0),
subSystem = cms.untracked.string("TotemTiming"),
sampicSubDetId = cms.uint32(5),
configuration = cms.VPSet(
# 2017, before detector inserted in DAQ
cms.PSet(
Expand Down Expand Up @@ -137,6 +140,7 @@
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(ctppsPixelDigis, isRun3 = False )
(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(totemDAQMappingESSourceXML_TotemTiming, sampicSubDetId = 6 )

# raw-to-digi task and sequence
ctppsRawToDigiTask = cms.Task(
Expand Down