Changeset 6004


Ignore:
Timestamp:
01/25/05 23:11:15 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 added
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5994 r6004  
    6262
    6363 2005/01/25 Markus Gaug
     64
     65   * mcalib/MCalibrationPattern.[h,cc]
     66   * mcalib/MCalibrationPatternDecode.[h,cc]
     67     - New Decoder task for the calibration pattern from the
     68       digital modules
    6469
    6570   * mbadpixels/MBadPixelsPix.h

  • trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

    r5858 r6004  
    88#pragma link C++ class MCalibColorSteer+;
    99#pragma link C++ class MCalibCalcFromPast+;
     10#pragma link C++ class MCalibrationPattern+;
     11#pragma link C++ class MCalibrationPatternDecode+;
    1012
    1113#pragma link C++ class MCalibrate+;
    … …  
    1921#pragma link C++ class MCalibrationIntensityRelTimeCam+;
    2022#pragma link C++ class MCalibrationIntensityTestCam+;
    21 #pragma link C++ class MCalibrationIntensityHiLoCam+;
    2223#pragma link C++ class MCalibrationCam+;
    2324#pragma link C++ class MCalibrationPix+;

  • trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

    r5951 r6004  
    5454#include "MCalibrationIntensityQECam.h"
    5555#include "MCalibrationIntensityRelTimeCam.h"
    56 #include "MCalibrationIntensityHiLoCam.h"
    5756
    5857#include "MBadPixelsIntensityCam.h"
    … …  
    206205  }
    207206     
    208   //
    209   // Look for the MFillH name "FillRelTimeCam". In case yes, initialize the
    210   // corresponding IntensityCam
    211   //
    212   /*
    213   if (pList->FindObject(AddSerialNumber("MHCalibrationHiLoCam")))
    214   {
    215 
    216     fIntensHiLo = (MCalibrationIntensityHiLoCam*)pList->FindCreateObj("MCalibrationIntensityHiLoCam");
    217 
    218     *fLog << inf << "Found MHCalibrationHiLoCam ... " << flush;
    219 
    220     if (!fIntensHiLo)
    221       {
    222         *fLog << err << "Could not find nor create MCalibrationIntensityHiLoCam abort... " << endl;
    223         return kFALSE;
    224       }
    225   }
    226   */
    227 
    228207  fNumCam    = 0;
    229208  fNumEvents = 0;
    … …  
    254233  if (Finalize("MHCalibrationChargeBlindCam")) *fLog << "MHCalibrationChargeBlindCam ready" << flush;
    255234  if (Finalize("MHCalibrationRelTimeCam"))     *fLog << "MHCalibrationRelTimeCam ready" << flush; 
    256   //  if (Finalize("MHCalibrationHiLoCam"))        *fLog << "MHCalibrationHiLoCam ready" << flush; 
    257235
    258236  //

  • trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h

    r5857 r6004  
    1616class MCalibrationIntensityQECam;
    1717class MCalibrationIntensityRelTimeCam;
    18 class MCalibrationIntensityHiLoCam;
    1918class MBadPixelsIntensityCam;
    2019class MCalibCalcFromPast : public MTask
    … …  
    3029  MCalibrationIntensityQECam      *fIntensQE;        //! Intensity QE     Cam (to be created)
    3130  MCalibrationIntensityRelTimeCam *fIntensRelTime;   //! Intensity Rel. Time Cam (to be created)
    32   MCalibrationIntensityHiLoCam    *fIntensHiLo;      //! Intensity High-Vs.Low Cam (to be created)
    3331  MBadPixelsIntensityCam          *fIntensBad;       //! Intensity Bad Pixels Cam (to be created)
    3432 

  • trunk/MagicSoft/Mars/mcalib/Makefile

    r5858 r6004  
    3535           MCalibCalcFromPast.cc \
    3636           MCalibrateData.cc \
     37           MCalibrationPattern.cc \
     38           MCalibrationPatternDecode.cc \
    3739           MCalibrateRelTimes.cc \
    3840           MCalibrationIntensityCam.cc \
    … …  
    4244           MCalibrationIntensityRelTimeCam.cc \
    4345           MCalibrationIntensityTestCam.cc \
    44            MCalibrationIntensityHiLoCam.cc \
    4546           MCalibrationCam.cc \
    4647           MCalibrationPix.cc  \

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r5996 r6004  
    119119#include "MCalibrationIntensityQECam.h"
    120120
     121#include "MCalibrationPatternDecode.h"
    121122#include "MCalibrationCam.h"
    122123#include "MCalibrationQECam.h"
    … …  
    16211622    // Other Tasks
    16221623    //
     1624    MCalibrationPatternDecode decode;
    16231625    MGeomApply               apply;
    16241626    apply.SetGeometry(fGeometry);
    … …  
    16931695    taskenv.SetDefault(fExtractor);
    16941696
     1697    tlist.AddToList(&decode);
    16951698    tlist.AddToList(&merge);
    16961699    tlist.AddToList(&apply);
Note: See TracChangeset for help on using the changeset viewer.