Changeset 18270 for trunk/Mars/fact


Ignore:
Timestamp:
07/16/15 15:11:58 (9 years ago)
Author:
Daniela Dorner
Message:
changed to usage of general drs-time-calib file and implemented usage of delays
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/fact/analysis/callisto_data.C

    r18147 r18270  
    9090    // -------------------------------------------------------
    9191
    92     TFile file(drstime);
    93     if (file.IsZombie())
     92    MDrsCalibrationTime timecam;
     93    if (!timecam.ReadFits(drstime))
    9494    {
    95         gLog << err << "ERROR - Could not open " << drstime << endl;
     95        gLog << err << "ERROR - Could not get MDrsCalibrationTime from " << drstime << endl;
    9696        return 21;
    9797    }
    9898
    99     MDrsCalibrationTime *timecam = 0;
    100     file.GetObject("MDrsCalibrationTime", timecam);
    101     if (!timecam)
     99    if (delays)
    102100    {
    103         gLog << err << "ERROR - Could not get MDrsCalibrationTime from " << drstime << endl;
    104         return 22;
     101        TGraph g(delays);
     102        if (g.GetN()!=1440)
     103        {
     104            gLog << err << "Error reading file " << delays << endl;
     105            return 22;
     106        }
     107
     108        timecam.SetDelays(g);
    105109    }
    106110
     
    203207    plist5.AddToList(&drscalib300);
    204208    plist5.AddToList(&badpixels);
    205     plist5.AddToList(timecam);
     209    plist5.AddToList(&timecam);
    206210
    207211    MEvtLoop loop5("CalibratingData");
Note: See TracChangeset for help on using the changeset viewer.