Changeset 3249


Ignore:
Timestamp:
02/21/04 01:29:16 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3248 r3249  
    2525     with the results and told to calculate the fluxes in the
    2626     Finalize function
     27
     28   * mcalib/MCalibrate.[h,cc]
     29   * mcalib/MCalibrateData.[h,cc]
     30   * mcalib/MMcCalibrationCalc.[h,cc]
    2731 
     32  - replace MCalibrationCam by MCalibrationChargeCam
     33
    2834
    2935 2004/02/19: Markus Gaug

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

    r3245 r3249  
    3535//   Input Containers:
    3636//    MExtractedSingal
    37 //    MCalibrationCam
     37//    MCalibrationChargeCam
    3838//
    3939//   Output Containers:
    … …  
    5151#include "MGeomCam.h"
    5252
    53 #include "MCalibrationCam.h"
     53#include "MCalibrationChargeCam.h"
    5454#include "MCalibrationPix.h"
    5555
    … …  
    7676// The PreProcess searches for the following input containers:
    7777//  - MGeomCam
    78 //  - MCalibrationCam
     78//  - MCalibrationChargeCam
    7979//  - MExtractedSignalCam
    8080//
    … …  
    9898      {
    9999
    100         fCalibrations = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationCam"));
     100        fCalibrations = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
    101101        if (!fCalibrations)
    102102          {
    103             *fLog << err << AddSerialNumber("MCalibrationCam") << " not found ... aborting." << endl;
     103            *fLog << err << AddSerialNumber("MCalibrationChargeCam") << " not found ... aborting." << endl;
    104104            return kFALSE;
    105105          }

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

    r3241 r3249  
    1515
    1616class MGeomCam;
    17 class MCalibrationCam;
     17class MCalibrationChargeCam;
    1818class MExtractedSignalCam;
    1919class MCerPhotEvt;
    … …  
    2222{
    2323private:
    24     MGeomCam            *fGeomCam;      // Camera geometry container
    25     MCalibrationCam    *fCalibrations; // Calibration constants
    26     MExtractedSignalCam *fSignals;      // Integrated charge in FADCs counts
    27     MCerPhotEvt         *fCerPhotEvt;   // Cerenkov Photon Event used for calculation
     24    MGeomCam              *fGeomCam;      // Camera geometry container
     25    MCalibrationChargeCam *fCalibrations; // Calibration constants
     26    MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts
     27    MCerPhotEvt           *fCerPhotEvt;   // Cerenkov Photon Event used for calculation
    2828
    2929    Float_t fConversionHiLo;

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

    r3244 r3249  
    6060#include "MPedestalPix.h"
    6161
    62 #include "MCalibrationCam.h"
     62#include "MCalibrationChargeCam.h"
    6363#include "MCalibrationPix.h"
    6464
    … …  
    8989//  - MGeomCam
    9090//  - MPedestalCam
    91 //  - MCalibrationCam
     91//  - MCalibrationChargeCam
    9292//  - MExtractedSignalCam
    9393//
    … …  
    116116   if(fCalibrationMode>kNone)
    117117      {
    118         fCalibrations = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationCam"));
     118        fCalibrations = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
    119119        if (!fCalibrations)
    120120          {
    121             *fLog << err << AddSerialNumber("MCalibrationCam") << " not found ... aborting." << endl;
     121            *fLog << err << AddSerialNumber("MCalibrationChargeCam") << " not found ... aborting." << endl;
    122122            return kFALSE;
    123123          }

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

    r3140 r3249  
    2424class MGeomCam;
    2525class MPedestalCam;
    26 class MCalibrationCam;
     26class MCalibrationChargeCam;
    2727class MExtractedSignalCam;
    2828
    … …  
    3333{
    3434private:
    35     MPedestalCam        *fPedestal;     // Pedestals/slice [ADC counts]
    36     MCalibrationCam    *fCalibrations; // Calibration constants
    37     MExtractedSignalCam *fSignals;      // Integrated charge in FADCs counts
     35    MPedestalCam          *fPedestal;     // Pedestals/slice [ADC counts]
     36    MCalibrationChargeCam *fCalibrations; // Calibration constants
     37    MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts
    3838
    3939    MPedPhotCam         *fPedPhot;      // Pedestals/(used slices) [photons]

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

    r3207 r3249  
    3535//
    3636//  Output Containers:
    37 //   MCalibrationCam
     37//   MCalibrationChargeCam
    3838//
    3939/////////////////////////////////////////////////////////////////////////////
    … …  
    4848
    4949#include "MCalibrationPix.h"
    50 #include "MCalibrationCam.h"
     50#include "MCalibrationChargeCam.h"
    5151
    5252#include "MGeomCam.h"
    … …  
    9999    fADC2Phot = 0;
    100100
    101     fCalCam = (MCalibrationCam*) pList->FindObject(AddSerialNumber("MCalibrationCam"));
     101    fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
    102102    if (!fCalCam)
    103103    {
    104         *fLog << err << AddSerialNumber("MCalibrationCam") << "not found... aborting." << endl;
     104        *fLog << err << AddSerialNumber("MCalibrationChargeCam") << "not found... aborting." << endl;
    105105        return kFALSE;
    106106    }

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

    r2886 r3249  
    66#endif
    77
    8 class MCalibrationCam;
     8class MCalibrationChargeCam;
    99class MGeomCam;
    1010class MHillas;
    … …  
    1818{
    1919private:
    20     MCalibrationCam     *fCalCam;
    21     MGeomCam            *fGeom;
    22     MHillas             *fHillas;
    23     MNewImagePar        *fNew;
    24     MMcEvt              *fMcEvt;
    25     MMcFadcHeader       *fHeaderFadc;
     20    MCalibrationChargeCam     *fCalCam;
     21    MGeomCam                  *fGeom;
     22    MHillas                   *fHillas;
     23    MNewImagePar              *fNew;
     24    MMcEvt                    *fMcEvt;
     25    MMcFadcHeader             *fHeaderFadc;
    2626
    2727    Float_t fADC2Phot;
    … …  
    3232    Bool_t CheckRunType(MParList *pList) const;
    3333    Int_t  PreProcess(MParList *pList);
     34    Bool_t ReInit(MParList *pList);
    3435    Int_t  Process();
    3536    Int_t  PostProcess();
    36     Bool_t ReInit(MParList *pList);
    3737
    3838public:
Note: See TracChangeset for help on using the changeset viewer.