Changeset 9542 for trunk


Ignore:
Timestamp:
02/04/10 17:07:24 (15 years ago)
Author:
snruegam
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9541 r9542  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2010/02/04 Stefan Ruegamer
     22
     23   * mraw/MRawRunHeader.cc
     24     - changed GetTypeID()!=fTelescopeNumber*10U+5U to GetTypeID()!=5U
     25       so that the new 5xxxxxx sequences can be processed
     26     - adapted error message
     27     - inserted Domino calibration run
     28     
     29   * mraw/MRawRunHeader.cc
     30     - inserted Domino calibration run
     31
     32
    2033
    2134 2010/02/01 Daniela Dorner

  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

    r9462 r9542  
    351351        if (GetTypeID()!=fTelescopeNumber     &&
    352352            GetTypeID()!=fTelescopeNumber*10U &&
    353             GetTypeID()!=fTelescopeNumber*10U+5U)
     353            GetTypeID()!=5U)
    354354        {
    355             *fLog << err << "ERROR - Telscope number " << fTelescopeNumber << " doesn't match the first two digits of the run number " << fRunNumber << "." << endl;
     355            *fLog << err << "ERROR - Telescope number " << fTelescopeNumber << " doesn't match the first two digits of the run number " << fRunNumber << " and run number doesn't start with 5." << endl;
    356356            return kFALSE;
    357357        }
    … …  
    950950    case kRTCalibration:
    951951        return "Calibration";
     952    case kRTDominoCal:
     953        return "DominoCal";
    952954    case kRTLinearity:
    953955        return "Linearity";
    … …  
    974976    case kRTCalibration:
    975977        return 'C';
     978    case kRTDominoCal:
     979        return 'L';
    976980    case kRTLinearity:
    977981        return 'N';

  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

    r9462 r9542  
    2525        kRTPedestal    = 0x0001,
    2626        kRTCalibration = 0x0002,
     27        kRTDominoCal   = 0x0003,
    2728        kRTLinearity   = 0x0004,
    2829        kRTPointRun    = 0x0007,
Note: See TracChangeset for help on using the changeset viewer.