← Back to branch summary

~christopher-hunt08/maus/maus_analysis_devel

« back to all changes in this revision

Viewing changes to src/input/InputCppDAQData/InputCppDAQData.cc

  • Committer: Christopher Hunt
  • Date: 2018-04-05 10:33:21 UTC
  • mfrom: (697.23.8 merge3)
  • Revision ID: christopher.hunt08@imperial.ac.uk-20180405103321-3q8yf42av2jrqw6o
Merged Trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/input/InputCppDAQData/InputCppDAQData.cc
342
342
    int zs_threshold = configJSON[xDataCard].asInt();
343
343
    processor->set_zs_threshold(zs_threshold);
344
344
 
 
345
    std::string xConfDir = "SciFiConfigDir";
 
346
    assert(configJSON.isMember(xConfDir));
345
347
    xDataCard = "SciFiCalibrationFileName";
346
348
    assert(configJSON.isMember(xDataCard));
 
349
    std::string config_dir = configJSON[xConfDir].asString();
347
350
    calib_file = configJSON[xDataCard].asString();
348
 
    char* pMAUS_ROOT_DIR = getenv("MAUS_ROOT_DIR");
349
 
    std::string fname = std::string(pMAUS_ROOT_DIR)+"/files/calibration/"+calib_file;
 
351
    std::string fname = config_dir+"/files/calibration/"+calib_file;
350
352
    std::ifstream inf(fname.c_str());
351
353
    if (!inf) {
352
354
      throw(Exceptions::Exception(Exceptions::recoverable,