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

Open and close conditions file after TFileAdaptor is enabled #3337

Merged
merged 1 commit into from Apr 15, 2014
Merged

Open and close conditions file after TFileAdaptor is enabled #3337

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions FWCore/Framework/bin/cmsRun.cpp
View file
Open in desktop
Expand Up @@ -23,7 +23,6 @@ PSet script. See notes in EventProcessor.cpp for details about it.
#include "FWCore/Utilities/interface/Presence.h"

#include "TError.h"
#include "TFile.h"

#include "boost/program_options.hpp"
#include "boost/shared_ptr.hpp"
Expand Down Expand Up @@ -330,11 +329,6 @@ int main(int argc, char* argv[]) {
edm::MessageDrop::instance()->jobMode = jobMode;
}

// FIXME: BEGIN temporary workaround for checksum problems in conditions
edm::FileInPath condfile("FWCore/Framework/data/cond_dump.root");
TFile* fptr = TFile::Open(condfile.fullPath().c_str());
fptr->Close();
// END temporary workaround for checksum problems in conditions
context = "Constructing the EventProcessor";
std::auto_ptr<edm::EventProcessor>
procP(new
Expand Down
9 changes: 9 additions & 0 deletions FWCore/Framework/src/EventProcessor.cc
View file
Open in desktop
Expand Up @@ -84,6 +84,9 @@
#include <sched.h>
#endif

//FIXME: Needed for temporary workaround for checksum problem in conditions
#include "TFile.h"

namespace edm {

// ---------------------------------------------------------------
Expand Down Expand Up @@ -457,6 +460,12 @@ namespace edm {
// intialize miscellaneous items
boost::shared_ptr<CommonParams> common(items.initMisc(*parameterSet));

// FIXME: BEGIN temporary workaround for checksum problems in conditions
edm::FileInPath condfile("FWCore/Framework/data/cond_dump.root");
TFile* fptr = TFile::Open(condfile.fullPath().c_str());
fptr->Close();
// END temporary workaround for checksum problems in conditions

// intialize the event setup provider
esp_ = espController_->makeProvider(*parameterSet);

Expand Down