Skip to content
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

Jump to bottom

CTPPS: bug fix in run ranges for FEDs channels mapping #18461

Merged
merged 3 commits into from Apr 27, 2017
Merged

CTPPS: bug fix in run ranges for FEDs channels mapping #18461

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
94fd638
Modified the run ranges at which the diamond and strips mappings are …
forthommel Apr 25, 2017
3cceaaa
Backport of the fix to the bug preventing to check for CRC errors on …
forthommel Apr 25, 2017
bbc0068
First event in run is set to 0 instead of 1 in the channels mapping r…
forthommel Apr 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CondFormats/CTPPSReadoutObjects/plugins/TotemDAQMappingESSourceXML.cc
View file
Open in desktop
Expand Up @@ -235,8 +235,8 @@ void TotemDAQMappingESSourceXML::setIntervalFor(const edm::eventsetup::EventSetu

// event id "1:min" has a special meaning and is translated to a truly minimal event id (1:0:0)
EventID startEventID = bl.validityRange.startEventID();
if (startEventID == EventID(1, 0, 1))
startEventID = EventID(1, 0, 0);
if (startEventID.event() == 1)
startEventID = EventID(startEventID.run(), startEventID.luminosityBlock(), 0);
Copy link
Contributor

Choose a reason for hiding this comment

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

I suspect that "1" in "1:min" was not special and the comment should be
// event id "N:min" has a special meaning and is translated to a truly minimal event id (N:0:0)
We have clearly discovered in MC that the first call is made not inside an event but inside a beginRun transition to make this comment for MC. This PR is apparently the first time we tried this code on the transition run.

If you look in the job failing in 283820 the file first entry is the run transition

         283820              0              0              0 (Run)


if (startEventID <= iosv.eventID() && iosv.eventID() <= bl.validityRange.endEventID())
{
Expand Down
5 changes: 3 additions & 2 deletions EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py
View file
Open in desktop
Expand Up @@ -2,5 +2,6 @@

from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi

ctppsDiamondRawToDigi = totemVFATRawToDigi.copy()
ctppsDiamondRawToDigi.subSystem = "TimingDiamond"
ctppsDiamondRawToDigi = totemVFATRawToDigi.clone(
subSystem = cms.string('TimingDiamond')
)
5 changes: 3 additions & 2 deletions EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py
View file
Open in desktop
Expand Up @@ -2,5 +2,6 @@

from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi

totemRPRawToDigi = totemVFATRawToDigi.copy()
totemRPRawToDigi.subSystem = "TrackingStrip"
totemRPRawToDigi = totemVFATRawToDigi.clone(
subSystem = cms.string('TrackingStrip')
)
1 change: 1 addition & 0 deletions EventFilter/CTPPSRawToDigi/src/RawToDigiConverter.cc
View file
Open in desktop
Expand Up @@ -109,6 +109,7 @@ void RawToDigiConverter::RunCommon(const VFATFrameCollection &input, const Totem
problemsPresent = true;

if (verbosity > 0)
fes << " CRC failure\n";

if (testCRC == tfErr)
{
Expand Down
3 changes: 2 additions & 1 deletion EventFilter/CTPPSRawToDigi/test/test_standard_sequence_cfg.py
View file
Open in desktop
Expand Up @@ -14,7 +14,8 @@
# raw data source
process.source = cms.Source("PoolSource",
fileNames = cms.untracked.vstring(
'/store/express/Run2016H/ExpressPhysics/FEVT/Express-v2/000/283/877/00000/4EE44B0E-2499-E611-A155-02163E011938.root'
# '/store/express/Run2016H/ExpressPhysics/FEVT/Express-v2/000/283/877/00000/4EE44B0E-2499-E611-A155-02163E011938.root'
'/store/data/Run2016H/ZeroBias/RAW/v1/000/283/820/00000/462D2A5B-B19A-E611-B100-02163E01382E.root'
)
)

Expand Down