Changeset 15278 for trunk/FACT++/gui


Ignore:
Timestamp:
Apr 8, 2013, 1:07:15 PM (7 years ago)
Author:
lyard
Message:
fixed wrong run type display, fixed calibration loading
File:
1 edited

Legend:

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

    r15241 r15278  
    260260void RawDataViewer::drawPixelCurve()
    261261{
    262     float xZoom, yZoom;
    263     xZoom = yZoom = 1.0f;
    264262    float xRange = bboxMax[0] - bboxMin[0];
    265263    float yRange = bboxMax[1] - bboxMin[1];
     
    377375    fIsDrsCalibration = false;
    378376    SetAutoRefresh(true);
    379 
     377    runType = "unkown";
    380378    PixelMap mypMap;
    381379    if (!mypMap.Read("/swdev_nfs/FACT++/FACTmap111030.txt"))
     
    597595    runNumber =      inputFile->HasKey("RUNID") ?  inputFile->GetInt("RUNID") : -1;
    598596    nTM =            inputFile->HasKey("NTMARK") ? inputFile->GetInt("NTMARK") : 0;
    599     runType =        inputFile->HasKey("RUNTYPE") ? inputFile->GetInt("RUNTYPE") : -1;
     597
     598    runType = "unkown";
     599    if (inputFile->HasKey("RUNTYPE"))
     600    {
     601        runType = inputFile->GetStr("RUNTYPE");
     602        if (runType == "")
     603            runType = "unkown";
     604    }
    600605    firstDataTime =  inputFile->HasKey("TSTART") ? inputFile->GetInt("TSTART") : -1;
    601606    lastDataTime =   inputFile->HasKey("TSTOP") ? inputFile->GetInt("TSTOP"): -1;
     
    751756    catch (const runtime_error &e)
    752757    {
    753         msg = e.what();
    754     }
    755 
     758        msg = string("Something went wrong while loading Drs Calib: ") + e.what() + string(".. Aborting file loading");
     759    }
    756760    cerr << msg << endl;
    757761    fDrsCalib.Clear();
Note: See TracChangeset for help on using the changeset viewer.