Ignore:
Timestamp:
01/29/04 16:52:22 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/manalysis
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/manalysis/MArrivalTime.h

    r2935 r2958  
    22#define MARS_MArrivalTime
    33
     4#ifndef MARS_MParContainer
     5#include "MParContainer.h"
     6#endif
    47#ifndef MARS_MCamEvent
    58#include "MCamEvent.h"
    … …  
    1518class MRawEvtData;
    1619
    17 class MArrivalTime : public MCamEvent
     20class MArrivalTime : public MParContainer, public MCamEvent
    1821{
    1922 private:

  • trunk/MagicSoft/Mars/manalysis/MCameraData.h

    r2781 r2958  
    77#ifndef ROOT_TArrayC
    88#include <TArrayC.h>
     9#endif
     10#ifndef MARS_MParContainer
     11#include "MParContainer.h"
    912#endif
    1013#ifndef MARS_MCamEvent
    … …  
    1720class MPedPhotCam;
    1821
    19 class MCameraData : public MCamEvent
     22class MCameraData : public MParContainer, public MCamEvent
    2023{
    2124private:

  • trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

    r2502 r2958  
    1818class MCerPhotPix;
    1919
    20 class MCerPhotEvt : public MCamEvent
     20class MCerPhotEvt : public MParContainer, public MCamEvent
    2121{
    2222private:

  • trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

    r2946 r2958  
    3636
    3737#include "MParList.h"
    38 #include "MGeomCam.h"
    3938
    4039#include "MRawEvtData.h"
    … …  
    125124        return kFALSE;
    126125   
    127     return kTRUE;
    128 }
    129 
    130 
    131 // --------------------------------------------------------------------------
    132 //
    133 // The ReInit searches for the following input containers:
    134 //  - MRawRunHeader
    135 //
    136 Bool_t MExtractSignal::ReInit(MParList *pList )
    137 {
    138     MGeomCam *cam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
    139     if (!cam)
    140     {
    141         *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
    142         return kFALSE;
    143     }
    144 
    145126    return kTRUE;
    146127}

  • trunk/MagicSoft/Mars/manalysis/MExtractSignal.h

    r2901 r2958  
    2929    static const Byte_t fgLast;
    3030
    31     MPedestalCam             *fPedestals;    // Pedestals of all pixels in the camera
    32     MExtractedSignalCam      *fSignals;      // Extracted signal of all pixels in the camera
     31    MPedestalCam        *fPedestals;    // Pedestals of all pixels in the camera
     32    MExtractedSignalCam *fSignals;      // Extracted signal of all pixels in the camera
    3333
    34     MRawEvtData              *fRawEvt;       // raw event data (time slices)
    35     MRawRunHeader            *fRunHeader;    // RunHeader information
     34    MRawEvtData         *fRawEvt;       // raw event data (time slices)
     35    MRawRunHeader       *fRunHeader;    // RunHeader information
    3636
    37     MArrivalTime             *fArrivalTime;  // Arrival Time of FADC sample
     37    MArrivalTime        *fArrivalTime;  // Arrival Time of FADC sample
    3838 
    39     Byte_t fHiGainFirst;
    40     Byte_t fLoGainFirst;
     39    Byte_t  fHiGainFirst;
     40    Byte_t  fLoGainFirst;
    4141
    42     Byte_t fNumHiGainSamples;
    43     Byte_t fNumLoGainSamples;
     42    Byte_t  fNumHiGainSamples;
     43    Byte_t  fNumLoGainSamples;
    4444
    4545    Float_t fSqrtHiGainSamples;
    … …  
    4848    Byte_t  fSaturationLimit;
    4949
    50     Bool_t ReInit(MParList *pList);
    5150    Int_t  PreProcess(MParList *pList);
    5251    Int_t  Process();

  • trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h

    r2914 r2958  
    11#ifndef MARS_MExtractedSignalCam
    22#define MARS_MExtractedSignalCam
     3
     4#ifndef MARS_MParContainer
     5#include "MParContainer.h"
     6#endif
    37
    48#ifndef MARS_MCamEvent
    … …  
    913class MExtractedSignalPix;
    1014
    11 class MExtractedSignalCam : public MCamEvent
     15class MExtractedSignalCam : public MParContainer, public MCamEvent
    1216{
    1317private:
    14     TClonesArray *fArray; // FIXME: Change TClonesArray away from a pointer?
     18    TClonesArray *fArray; //-> FIXME: Change TClonesArray away from a pointer?
    1519
    1620    Byte_t fFirstUsedSliceHiGain;

  • trunk/MagicSoft/Mars/manalysis/MPedPhotCam.h

    r2630 r2958  
    22#define MARS_MPedPhotCam
    33
     4#ifndef MARS_MParContainer
     5#include "MParContainer.h"
     6#endif
    47#ifndef MARS_MCamEvent
    58#include "MCamEvent.h"
    … …  
    1114class MPedPhotPix;
    1215
    13 class MPedPhotCam : public MCamEvent
     16class MPedPhotCam : public MParContainer, public MCamEvent
    1417{
    1518private:

  • trunk/MagicSoft/Mars/manalysis/MPedestalCam.h

    r2951 r2958  
    22#define MARS_MPedestalCam
    33
     4#ifndef MARS_MParContainer
     5#include "MParContainer.h"
     6#endif
    47#ifndef MARS_MCamEvent
    58#include "MCamEvent.h"
    … …  
    1114class MPedestalPix;
    1215
    13 class MPedestalCam : public MCamEvent
     16class MPedestalCam : public MParContainer, public MCamEvent
    1417{
    1518private:
    … …  
    2124
    2225    void Clear(Option_t *o="");
    23     void InitUseHists();
    2426   
    2527    void InitSize(const UInt_t i);
    2628    Int_t GetSize() const;
     29
     30    void InitUseHists();
    2731
    2832    MPedestalPix &operator[](Int_t i);
Note: See TracChangeset for help on using the changeset viewer.