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

updates for DAQ2 testing #5492

Merged
merged 2 commits into from Sep 23, 2014
Merged

updates for DAQ2 testing #5492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c4cb50
RawEventFileWriterForBU: create EoR file at run end
fwyzard Sep 23, 2014
5a81fda
EvFDaqDirector: correctly clean up the bu.lock file
fwyzard Sep 23, 2014
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
15 changes: 12 additions & 3 deletions EventFilter/Utilities/plugins/RawEventFileWriterForBU.cc
View file
Open in desktop
Expand Up @@ -272,12 +272,21 @@ void RawEventFileWriterForBU::endOfLS(int ls)
perLumiTotalEventCount_ = 0;
}

//runs on SIGINT and terminates the process
void RawEventFileWriterForBU::handler(int s){
void RawEventFileWriterForBU::stop()
{
// create EoR file
std::string path = destinationDir_ + "/" + runPrefix_ + "_ls0000_EoR.jsn";
runMon_->snap(0);
runMon_->outputFullJSON(path, 0);
}

// runs on SIGINT and terminates the process
void RawEventFileWriterForBU::handler(int s)
{
printf("Caught signal %d. Writing EOR file!\n",s);
if (destinationDir_.size() > 0)
{
// CREATE EOR file
// create EoR file
if (run_==-1) makeRunPrefix(destinationDir_);
std::string path = destinationDir_ + "/" + runPrefix_ + "_ls0000_EoR.jsn";
runMon_->snap(0);
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/Utilities/plugins/RawEventFileWriterForBU.h
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ class RawEventFileWriterForBU
uint32 adler32() const { return (adlerb_ << 16) | adlera_; }

void start(){}
void stop() {}
void stop();
void initialize(std::string const& destinationDir, std::string const& name, int ls);
void endOfLS(int ls);
bool sharedMode() const {return false;}
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/Utilities/src/EvFDaqDirector.cc
View file
Open in desktop
Expand Up @@ -213,7 +213,7 @@ namespace evf {
close(bu_readlock_fd_);
close(bu_writelock_fd_);
if (directorBu_) {
std::string filename = base_dir_ + "/bu.lock";
std::string filename = bu_run_dir_ + "/bu.lock";
removeFile(filename);
}
}
Expand Down