Changeset 3389


Ignore:
Timestamp:
03/03/04 13:50:05 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r3388 r3389  
    44
    55                                                 -*-*- END OF LINE -*-*-
     6 2004/03/03: Thomas Bretz
     7
     8   * mgeom/MGeomCam.cc:
     9     - give a name and title also if the default constructor is used
     10
     11   * mgeom/MGeomMirror.[h,cc]:
     12     - added member function GetReflection
     13     - added persistent data member fReflector
     14
     15   * mjobs/MJCalibration.cc, mjobs/MJExtractSignal.cc, mjobs/MJPedestal.cc:
     16     - fixed a typo in the output
     17
     18   * mraw/MRawFileWrite.cc:
     19     - added the missing '.' to MRawRunHeader. Because of the design of
     20       MReadTree this is backward compatible
     21
     22   * mraw/MRawRunHeader.h:
     23     - removed last change from Abelardo. '>255' is the correct
     24       check for MC files following the definition that all MC files
     25       have run types >255 which was made in the past.
     26
     27   * manalysis/MCerPhotAnal.[h,cc], manalysis/MCerPhotAnal2.[h,cc]:
     28     - created ReInit member function to hold all code (moved from
     29       PreProcess) accessing the run header. The run header is not
     30       available in PreProcess. That it was working before was only
     31       by chance, because the run type is initialized with 65535 which
     32       is != 255 but not >255.
     33
     34
    635
    736 2004/03/03: Sebastian Raducci
     37
    838   * msignal/MArrivalTimeCalc.cc
    939     - The calculation of the arrival times is made only when needed
    1040       (when the HalfMax is over the pedestal)
    1141
     42
     43
    1244 2004/03/03: Abelardo Moralejo
     45
    1346   * mraw/MRawRunHeader.h
    1447     - Replaced
    1548         Bool_t IsMonteCarloRun() const { return fRunType>0x00ff; }  by
    1649         Bool_t IsMonteCarloRun() const { return (fRunType==0x0100); }
    17 
    1850     since the latter is the exact translation of what the function
    1951     intends to do. I do not know why, but the display of real data
     
    2456       fails after that change, both for old and new camera files.
    2557       Put back fPixels[i] = new MGeomPix; in constructor.
     58
     59
    2660
    2761 2004/03/02: Abelardo Moralejo
     
    3367     - Added GetNumCT() function.
    3468     - Replaced
    35           fTelescopes[i]= new MGeomCorsikaCT;   by
    36 
     69          fTelescopes[i]= new MGeomCorsikaCT;   
     70       by
    3771          MGeomCorsikaCT* dummy = new  MGeomCorsikaCT();
    3872          fTelescopes.Add(dummy);
    39 
    4073
    4174   * mgeom/MGeomCorsikaCT.[h,cc]
     
    4578   * mgeom/MGeomCam.cc  => NOTE: this change was undone later!
    4679     - Replaced
    47         fPixels[i] = new MGeomPix;   by
    48 
    49         MGeomPix* dummy = new MGeomPix();
    50         fPixels.Add(dummy);
     80          fPixels[i] = new MGeomPix;   
     81       by
     82          MGeomPix* dummy = new MGeomPix();
     83          fPixels.Add(dummy);
     84
    5185
    5286
  • trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc

    r3374 r3389  
    103103        return kFALSE;
    104104
     105    return kTRUE;
     106}
     107
     108Bool_t MCerPhotAnal::ReInit(MParList *pList)
     109{
    105110    fPedestals = NULL;
    106111
     112    // This must be done in ReInit because in PreProcess the
     113    // headers are not available
    107114    const MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
    108115    if (!runheader)
  • trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.h

    r2408 r3389  
    2727    MRawRunHeader *fRunHeader;  // RunHeader information
    2828
    29     Int_t PreProcess(MParList *pList);
    30     Int_t Process();
     29    Int_t  PreProcess(MParList *pList);
     30    Bool_t ReInit(MParList *pList);
     31    Int_t  Process();
    3132 
    3233public:
  • trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc

    r3374 r3389  
    106106        return kFALSE;
    107107
     108    return kTRUE;
     109}
     110
     111Bool_t MCerPhotAnal2::ReInit(MParList *pList)
     112{
    108113    fPedestals=NULL;
    109114
     115    // This must be done in ReInit because in PreProcess the
     116    // headers are not available
    110117    const MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
    111118    if (!runheader)
    112119        *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
    113120    else
     121    {
     122        *fLog << all << "CHECK: " << runheader->GetRunType() << endl;
    114123        if (runheader->IsMonteCarloRun())
    115124            return kTRUE;
     125    }
    116126
    117127    fPedestals = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam");
  • trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.h

    r2946 r3389  
    3333    Int_t fSkip;                //!
    3434
    35     Int_t PreProcess(MParList *pList);
    36     Int_t Process();
    37     Int_t PostProcess();
     35    Int_t  PreProcess(MParList *pList);
     36    Bool_t ReInit(MParList *pList);
     37    Int_t  Process();
     38    Int_t  PostProcess();
    3839
    3940public:
  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

    r3388 r3389  
    8080    UShort_t GetFormatVersion() const     { return fFormatVersion; }
    8181    UShort_t GetSoftVersion() const       { return fSoftVersion; }
     82    UInt_t   GetRunNumber() const         { return fRunNumber; }
    8283    UShort_t GetRunType() const           { return fRunType; }
    83     const char *GetRunTypeStr() const;
    84     UInt_t   GetRunNumber() const         { return fRunNumber; }
    85     const Char_t  *GetProjectName() const { return fProjectName; }
    86     const Char_t  *GetSourceName() const  { return fSourceName; }
    87     const Char_t  *GetSourceEpocheChar() const { return fSourceEpochChar; }
     84    const Char_t *GetRunTypeStr() const;
     85    const Char_t *GetProjectName() const { return fProjectName; }
     86    const Char_t *GetSourceName() const  { return fSourceName; }
     87    const Char_t *GetSourceEpocheChar() const { return fSourceEpochChar; }
    8888    UShort_t GetSourceEpocheDate() const  { return fSourceEpochDate; }
    8989    UShort_t GetNumCrates() const         { return fNumCrates; }
     
    106106    Int_t GetNumTotalBytes() const;
    107107
    108     Bool_t IsMonteCarloRun() const { return (fRunType==0x0100); }
     108    Bool_t IsMonteCarloRun() const { return fRunType>0x00ff; }
    109109
    110110    void Print(Option_t *t=NULL) const;
Note: See TracChangeset for help on using the changeset viewer.