Changeset 12114 for trunk


Ignore:
Timestamp:
09/16/11 14:30:24 (13 years ago)
Author:
tbretz
Message:
Relaxed a bit the requirements for a vlid file.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

    r12105 r12114  
    648648    entriesToCheck.push_back("NAXIS2");
    649649    entriesToCheck.push_back("NROI");
    650     entriesToCheck.push_back("NTMARK");
    651     entriesToCheck.push_back("RUNTYPE");
    652650    entriesToCheck.push_back("REVISION");
    653     entriesToCheck.push_back("BLDVER");
    654651    entriesToCheck.push_back("RUNID");
    655652    entriesToCheck.push_back("NBOARD");
     
    684681    nRoi = inputFile->GetInt("NROI");
    685682    runNumber = inputFile->GetInt("RUNID");
    686     nTM = inputFile->GetInt("NTMARK");
    687     runType = inputFile->GetInt("RUNTYPE");
     683    nTM = inputFile->HasKey("NTMARK") ? inputFile->GetInt("NTMARK") : 0;
     684    runType = inputFile->HasKey("RUNTYPE") ? inputFile->GetInt("RUNTYPE") : -1;
    688685    firstDataTime = inputFile->GetInt("TSTART");
    689686    lastDataTime = inputFile->GetInt("TSTOP");
    690687    nRoiTM = inputFile->GetInt("NROITM");
    691688    revision = inputFile->GetInt("REVISION");
    692     builderVersion = inputFile->GetInt("BLDVER");
     689    builderVersion = inputFile->HasKey("BLDVER") ? inputFile->GetInt("BLDVER") : -1;
    693690    nBoards = inputFile->GetInt("NBOARD");
    694691    nPixels = inputFile->GetInt("NPIX");
Note: See TracChangeset for help on using the changeset viewer.