Skip to content

Allow non-zero starting event or subrun values #1799

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

Open
michaelmackenzie wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

Allow non-zero starting event or subrun values #1799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 3 deletions Sources/src/PBISequence_source.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ namespace mu2e {
fhicl::Atom<std::string> moduleLabel{Name("reconstitutedModuleLabel"),Comment("Module label for the reconstituted data products"),"PBISequence"};
fhicl::Atom<std::string> instance{Name("deprecatedInstanceName"),Comment("Instance name for deprecated subrun data product ProtonBunchIntensity"),""};
fhicl::Atom<unsigned int> runNumber{Name("runNumber"), Comment("First run number")};
fhicl::Atom<unsigned int> firstSubRun{Name("firstSubRunNumber"), Comment("First subRun number, incrementing by one for each input file"), 0};
fhicl::Atom<unsigned int> firstEvent{Name("firstEventNumber"), Comment("First event number of first subRun (0 in the subsequent subRuns)"), 0};
fhicl::Atom<bool> integratedSummary{Name("integratedSummary"), Comment("If true, then PBI summary is summed over all input files; else per input file.")};
fhicl::Atom<unsigned int> verbosity{Name("verbosity"), Comment("Verbosity level; larger means more printout"), 0};

Expand All @@ -87,6 +89,8 @@ namespace mu2e {
std::string deprecatedInstanceName_;
art::SourceHelper const& pm_;
unsigned runNumber_;
unsigned firstSubRunNumber_;
unsigned firstEventNumber_;
unsigned subRunNumber_;
unsigned currentEventNumber_;
unsigned verbosity_;
Expand Down Expand Up @@ -135,8 +139,10 @@ namespace mu2e {
, deprecatedInstanceName_(conf().instance())
, pm_(pm)
, runNumber_(conf().runNumber())
, subRunNumber_(-1U)
, currentEventNumber_(0)
, firstSubRunNumber_(conf().firstSubRun())
, firstEventNumber_(conf().firstEvent())
, subRunNumber_(firstSubRunNumber_ - 1U)
, currentEventNumber_(firstEventNumber_)
, verbosity_(conf().verbosity())
, integratedSummary_(conf().integratedSummary())
{
Expand All @@ -159,7 +165,7 @@ namespace mu2e {
currentFile_ = new ifstream(currentFileName_,std::ifstream::in);
// reset counters
subRunNumber_++;
currentEventNumber_ = 0;
if(subRunNumber_ != firstSubRunNumber_) currentEventNumber_ = 0; // only reset after the first sub run
// compute statistics on protons in this file
nprotAcc_ = {};
double protons;
Expand Down