Changeset 859


Ignore:
Timestamp:
07/06/01 14:48:54 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r855 r859  
    11                                                                  -*-*- END -*-*-
     2 2001/07/06: Thomas Bretz
     3 
     4   * mfilter/FilterIncl.h, mfilter/FilterLinkDef.h,
     5     mfilter/MFTriggerLvl1.[h,cc], mfilter/mfilter/Makefile:
     6     - added
     7     
     8   * Makefile
     9     - mfilter added
     10     
     11   * Makefile.conf.linux-gnu:
     12     - added some warning options
     13     
     14   * Makefile.conf.osf1:
     15     - enhanced warnings
     16     
     17   * manalysis/MCerPhotEvt.cc:
     18     - removed a small buf from the constructor
     19     
     20   * BaseLinkDef.h:
     21     - added MFilter
     22     - added MFilterList
     23     
     24   * mbase/MLog.[h,cc]:
     25     - added a non-empty copy constructor to make cxx happy
     26     
     27   * mbase/MParList.[h,cc]:
     28     - added second overload-function FindObject
     29   
     30   * mbase/MTask.h:
     31     - added all Filter stuff
     32     
     33   * mbase/MTaskList.cc:
     34     - changed debug output
     35     - added filter-stuff to Process
     36     
     37   * mbase/MTaskList.h:
     38     - changed Print default option from NULL to ""
     39     
     40   * mbase/Makefile:
     41     - added MFilter
     42     - added MFilterList
     43   
     44   * mhist/MFillHFadc.cc:
     45     removed a small bug in the PreProcessing
     46   
     47   * manalysis/MCerPhotEvt.h, manalysis/MHillas.cc, manalysis/MHillas.h,
     48     manalysis/MImgCleanStd.cc, manalysis/MPedestalCam.h, mgui/MGeomCam.h,
     49     mhist/MFillHHillas.h, manalysis/MHillasCalc.h, manalysis/MCerPhotCalc.h,
     50     manalysis/MImgCleanStd.h, mhist/MFillHStarMap.h, mhist/MHHillas.cc,
     51     mhist/MHHillas.h, mhist/MHStarMap.cc, mhist/MHStarMap.h,
     52     mmc/MMcFadcHeader.hxx, mmc/MMcFadcHeader.hxx, mmc/MMcTrig.hxx,
     53     mmontecarlo/MMcThresholdCalc.h:
     54     - made more const-correct
     55
     56   * manalysis/MCT1ReadAscii.cc, manalysis/MCerPhotCalc.cc,
     57     manalysis/MHillasCalc.cc, manalysis/MImgCleanStd.cc,
     58     manalysis/MMcPedestalCopy.cc, manalysis/MPedCalcPedRun.cc,
     59     mhist/MFillHFadc.cc, mhist/MFillHHillas.cc, mhist/MFillHStarMap.cc,
     60     mmontecarlo/MMcThresholdCalc.cc, mraw/MRawFileRead.cc,
     61     mraw/MRawFileWrite.cc:
     62     - added comments
     63
     64   * manalysis/MCT1ReadAscii.cc, manalysis/MCerPhotCalc.cc,
     65     manalysis/MCerPhotPix.cc, manalysis/MHillas.cc,
     66     manalysis/MHillasCalc.cc, manalysis/MImgCleanStd.cc,
     67     manalysis/MMcPedestalCopy.cc, manalysis/MMcPedestalCopy.h,
     68     manalysis/MPedCalcPedRun.cc, manalysis/MPedestalCam.cc,
     69     manalysis/MPedestalPix.cc,
     70     mbase/MArray.cc, mbase/MArrayB.cc, mbase/MArrayS.cc, mbase/MEvtLoop.cc,
     71     mbase/MLog.cc, mbase/MParList.cc, mbase/MReadTree.cc, mbase/MTask.cc,
     72     mbase/MTime.cc, mbase/MWriteAsciiFile.cc, mbase/MWriteFile.cc,
     73     mbase/MWriteRootFile.cc,
     74     mhist/MFillHFadc.cc, mhist/MFillHFadc.cc, mhist/MFillHHillas.cc,
     75     mhist/MFillHStarMap.cc, mhist/MHFadcCam.cc, mhist/MHFadcPix.cc,
     76     mhist/MHHillas.cc, mhist/MHMcCollectionArea.cc, mhist/MHMcEnergies.cc,
     77     mhist/MHMcEnergy.cc, mhist/MHStarMap.cc, mraw/MRawCrateArray.cc,
     78     mraw/MRawCrateData.cc, mraw/MRawEvtData.cc, mraw/MRawEvtHeader.cc,
     79     mraw/MRawEvtPixelIter.cc, mraw/MRawFileRead.cc,
     80     mraw/MRawFileWrite.cc, mraw/MRawRunHeader.cc:
     81     - added semicolon after ClassImp to make my editor happy
     82
     83   * mmain/MEvtDisp.cc:
     84     - removed a wrong comma in the enumerations
     85     
     86   * mmontecarlo/MMcThresholdCalc.cc:
     87     - made compile on osf by removing brackets in new steatement (constructor)
     88     
     89
    290
    391 2001/07/05: Thomas Bretz

  • trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

    r695 r859  
    8686    // if no canvas is yet existing to draw into, create a new one
    8787    //
    88     if ( !gPad ) new TCanvas("display", "MAGIC display", 0, 0, 650, 500) ;
     88    if (!gPad) new TCanvas("display", "MAGIC display", 0, 0, 650, 500);
    8989
    9090    //
    9191    // draw all pixels of the camera
    9292    //
    93     for (UInt_t i=0; i< fNumPixels; i++)
     93    for (UInt_t i=0; i<fNumPixels; i++)
    9494        (*this)[i].Draw();
    9595
    … …  
    9797    // draw legend
    9898    //
    99     for (Int_t i=0; i< kITEMS_LEGEND; i++)
     99    for (Int_t i=0; i<kITEMS_LEGEND; i++)
    100100    {
    101101        GetBox(i)->Draw();

  • trunk/MagicSoft/Mars/mgui/MGeomCam.h

    r695 r859  
    3131    UInt_t GetNumPixels() const { return fNumPixels; }
    3232
    33     MGeomPix &operator[](Int_t i) { return *(MGeomPix*)fPixels->At(i); }
     33    MGeomPix &operator[](Int_t i)       { return *(MGeomPix*)fPixels->At(i); }
     34    MGeomPix &operator[](Int_t i) const { return *(MGeomPix*)fPixels->At(i); }
    3435
    3536    virtual void Print(Option_t *opt=NULL);

  • trunk/MagicSoft/Mars/mhist/MFillHFadc.cc

    r855 r859  
    2525
    2626//////////////////////////////////////////////////////////////////////////////
    27 //
    28 //  MFillHFadc
    29 //
    30 //  This task fill the n time slices from all pixels
    31 //  (stored in a MRawEvtData container) into histograms.
    32 //  This histograms (one per pixel) are stored in MHFadcCam, MHFadcPix
    33 //
     27//                                                                          //
     28//  MFillHFadc                                                              //
     29//                                                                          //
     30//  This task fill the n time slices from all pixels                        //
     31//  (stored in a MRawEvtData container) into histograms.                    //
     32//  This histograms (one per pixel) are stored in MHFadcCam, MHFadcPix      //
     33//                                                                          //
     34//  Input Containers:                                                       //
     35//   MRawEvtData                                                            //
     36//                                                                          //
     37//  Output Containers:                                                      //
     38//   MHFadcCam                                                              //
     39//                                                                          //
    3440//////////////////////////////////////////////////////////////////////////////
    3541
    … …  
    4349#include "MRawEvtPixelIter.h"
    4450
    45 ClassImp(MFillHFadc)
     51ClassImp(MFillHFadc);
    4652
    4753// --------------------------------------------------------------------------
    … …  
    6268    // check if all necessary input containers are existing
    6369    //
    64     fRawEvtData = (MRawEvtData*)pList->FindCreateObj("MRawEvtData");
     70    fRawEvtData = (MRawEvtData*)pList->FindObject("MRawEvtData");
    6571    if (!fRawEvtData)
    6672    {
    67         *fLog << dbginf << " Error: MRawEvtData not found... exit." << endl;
     73        *fLog << dbginf << "MRawEvtData not found... exit." << endl;
    6874        return kFALSE;
    6975    }

  • trunk/MagicSoft/Mars/mhist/MFillHHillas.cc

    r855 r859  
    2424\* ======================================================================== */
    2525
    26 ////////////////////////////////////////////////////////////////////////
    27 //
    28 //  MFillHHillas
    29 //
    30 //  This task fills the hillas parameter from MHillas into
    31 //  histograms (MHHillas)
    32 //
    33 ////////////////////////////////////////////////////////////////////////
     26//////////////////////////////////////////////////////////////////////////////
     27//                                                                          //
     28//  MFillHHillas                                                            //
     29//                                                                          //
     30//  This task fills the hillas parameter from MHillas into                  //
     31//  histograms (MHHillas)                                                   //
     32//                                                                          //
     33//  Input Containers:                                                       //
     34//   MHillas                                                                //
     35//                                                                          //
     36//  Output Containers:                                                      //
     37//   MHHillas                                                               //
     38//                                                                          //
     39//////////////////////////////////////////////////////////////////////////////
    3440#include "MFillHHillas.h"
    3541
    … …  
    3945#include "MParList.h"
    4046
    41 ClassImp(MFillHHillas)
     47ClassImp(MFillHHillas);
    4248
    4349// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhist/MFillHHillas.h

    r852 r859  
    1616class MFillHHillas : public MTask {
    1717 private:
    18   MHillas *fEvt;
     18  const MHillas *fEvt;
    1919  MHHillas *fHistos ;
    2020

  • trunk/MagicSoft/Mars/mhist/MFillHStarMap.cc

    r855 r859  
    2323\* ======================================================================== */
    2424
    25 ////////////////////////////////////////////////////////////////////////
    26 //
    27 //  MFillHStarMap
    28 //
    29 //  This task fills a star map (a 2D histogram, MHStarMap)
    30 //  from the calculated hillas parameter (MHillas).
    31 //  The algorithm for this can be found in MHStarMap::Fill
    32 //
    33 ////////////////////////////////////////////////////////////////////////
     25//////////////////////////////////////////////////////////////////////////////
     26//                                                                          //
     27//  MFillHStarMap                                                           //
     28//                                                                          //
     29//  This task fills a star map (a 2D histogram, MHStarMap)                  //
     30//  from the calculated hillas parameter (MHillas).                         //
     31//  The algorithm for this can be found in MHStarMap::Fill                  //
     32//                                                                          //
     33//  Input Containers:                                                       //
     34//   MHillas                                                                //
     35//                                                                          //
     36//  Output Containers:                                                      //
     37//   MHStarMap                                                              //
     38//                                                                          //
     39//////////////////////////////////////////////////////////////////////////////
    3440#include "MFillHStarMap.h"
    3541
    … …  
    4046#include "MParList.h"
    4147
    42 ClassImp(MFillHStarMap)
     48ClassImp(MFillHStarMap);
    4349
    4450// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhist/MFillHStarMap.h

    r852 r859  
    1414class MHillas;
    1515
    16 class MFillHStarMap : public MTask {
    17  private:
    18   MHillas   *fEvt;
    19   MHStarMap *fHistos ;
     16class MFillHStarMap : public MTask
     17{
     18private:
     19    const MHillas   *fEvt;
     20    MHStarMap *fHistos ;
    2021
    21  public:   
    22   MFillHStarMap(const char *name=NULL, const char *title=NULL);
     22public:
     23    MFillHStarMap(const char *name=NULL, const char *title=NULL);
    2324
    24   Bool_t PreProcess(MParList *pList);
    25   Bool_t Process();
    26   Bool_t PostProcess();
    27  
    28   ClassDef(MFillHStarMap, 0) // Task to fill a 2-dim histogram by the Hillas parameters
     25    Bool_t PreProcess(MParList *pList);
     26    Bool_t Process();
     27    Bool_t PostProcess();
    2928
     29    ClassDef(MFillHStarMap, 0) // Task to fill a 2-dim histogram by the Hillas parameters
    3030};
    31    
     31
    3232#endif
    3333

  • trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

    r765 r859  
    3636#include <TH1.h>
    3737
    38 ClassImp(MHFadcCam)
     38ClassImp(MHFadcCam);
    3939
    4040// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhist/MHFadcPix.cc

    r765 r859  
    3737#include <TPad.h>
    3838
    39 ClassImp(MHFadcPix)
     39ClassImp(MHFadcPix);
    4040
    4141// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhist/MHHillas.cc

    r852 r859  
    1717#include "MHillas.h"
    1818
    19 ClassImp(MHHillas)
     19ClassImp(MHHillas);
    2020
    2121MHHillas::MHHillas (const char *name, const char *title)
    … …  
    5555}
    5656
    57 void MHHillas::Fill(MHillas *par)
     57void MHHillas::Fill(const MHillas *par)
    5858{
    5959    fAlpha ->Fill(fabs(par->GetAlpha()));

  • trunk/MagicSoft/Mars/mhist/MHHillas.h

    r712 r859  
    2525    ~MHHillas();
    2626
    27     void Fill(MHillas *par);
     27    void Fill(const MHillas *par);
    2828
    2929    TH1F *GetHistAlpha()  { return fAlpha; }

  • trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc

    r853 r859  
    2929#include <TH2.h>
    3030
    31 ClassImp(MHMcCollectionArea)
     31ClassImp(MHMcCollectionArea);
    3232
    3333MHMcCollectionArea::MHMcCollectionArea(const char *name, const char *title)

  • trunk/MagicSoft/Mars/mhist/MHMcEnergies.cc

    r851 r859  
    2828#include "MHMcEnergy.h"
    2929
    30 ClassImp(MHMcEnergies)
     30ClassImp(MHMcEnergies);
    3131
    3232MHMcEnergies::MHMcEnergies(const UInt_t count, const char *name, const char *title)

  • trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc

    r855 r859  
    3232#include <TPaveLabel.h>
    3333
    34 ClassImp(MHMcEnergy)
     34ClassImp(MHMcEnergy);
    3535
    3636MHMcEnergy::MHMcEnergy(const UInt_t idx, const char *name, const char *title)

  • trunk/MagicSoft/Mars/mhist/MHStarMap.cc

    r749 r859  
    4242#include "MHillas.h"
    4343
    44 ClassImp(MHStarMap)
     44ClassImp(MHStarMap);
    4545
    4646MHStarMap::MHStarMap (const char *name, const char *title)
    … …  
    133133}
    134134
    135 void MHStarMap::Fill(MHillas *par)
     135void MHStarMap::Fill(const MHillas *par)
    136136{
    137137    const float dist  = par->GetDist();

  • trunk/MagicSoft/Mars/mhist/MHStarMap.h

    r712 r859  
    2727    ~MHStarMap();
    2828
    29     void Fill(MHillas *par);
     29    void Fill(const MHillas *par);
    3030
    3131    TH2F *GetHist()               { return fStarMap; }

  • trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc

    r855 r859  
    2828//  MMcThresholdCalc                                                       //
    2929//                                                                         //
     30//  Input Containers:                                                      //
     31//   MMcEvt                                                                //
     32//                                                                         //
     33//  Output Containers:                                                     //
     34//   MMcTrig;*, MHMcEnergy;*                                               //
     35//                                                                         //
    3036/////////////////////////////////////////////////////////////////////////////
    3137
    … …  
    5258    *fTitle = title ? title : "Task to calculate the energy threshold from Monte Carlo";
    5359
    54     fMcTrig     = new (MMcTrig*)[fDimension];
    55     fHMcEnergy  = new (MHMcEnergy*)[fDimension];
     60    fMcTrig     = new MMcTrig*[fDimension];
     61    fHMcEnergy  = new MHMcEnergy*[fDimension];
    5662    fMustDelete = new Bool_t[fDimension];
    5763
    … …  
    7581    // connect Monte Carlo data with this task
    7682
    77     char auxname[15]="MMcTrig"; // string to write container names
    78 
    7983    fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt");
    8084    if (!fMcEvt)
    … …  
    8387        return kFALSE;
    8488    }
     89
     90    char auxname[15]="MMcTrig"; // string to write container names
    8591
    8692    for (unsigned int i=0; i<fDimension; i++)

  • trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.h

    r846 r859  
    2323    UInt_t fDimension;
    2424
    25     MMcEvt      *fMcEvt;       // Container with Monte Carlo information
    26     MMcTrig    **fMcTrig;      // Container with Monte Carlo trigger information
    27     MHMcEnergy **fHMcEnergy;   // Container where we save the energy (threshold)
     25    const MMcEvt  *fMcEvt;       // Container with Monte Carlo information
     26    MMcTrig      **fMcTrig;      // Container with Monte Carlo trigger information
     27    MHMcEnergy   **fHMcEnergy;   // Container where we save the energy (threshold)
    2828
    29     Bool_t      *fMustDelete;  // delete indicator for selfcreated energy hists
     29    Bool_t        *fMustDelete;  // delete indicator for selfcreated energy hists
    3030
    3131public:

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

    r765 r859  
    4242#include "MLog.h"
    4343
    44 ClassImp(MRawCrateArray)
     44ClassImp(MRawCrateArray);
    4545
    4646// --------------------------------------------------------------------------

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

    r765 r859  
    4040#include "MLog.h"
    4141
    42 ClassImp(MRawCrateData)
     42ClassImp(MRawCrateData);
    4343
    4444MRawCrateData::MRawCrateData() : fDAQCrateNumber(0), fFADCEvtNumber(0), fFADCClockTick(0)

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

    r851 r859  
    6363#include "MRawRunHeader.h"
    6464
    65 ClassImp(MRawEvtData)
     65ClassImp(MRawEvtData);
    6666
    6767// --------------------------------------------------------------------------

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

    r761 r859  
    103103#include "MRawRunHeader.h"
    104104
    105 ClassImp(MRawEvtHeader)
     105ClassImp(MRawEvtHeader);
    106106
    107107// --------------------------------------------------------------------------

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

    r761 r859  
    5454#include "MArrayB.h"
    5555
    56 ClassImp(MRawEvtPixelIter)
     56ClassImp(MRawEvtPixelIter);
    5757
    5858// --------------------------------------------------------------------------

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

    r762 r859  
    3131//  either retrieved from the parameter list or created and added.
    3232//
     33//  Input Containers:
     34//   -/-
     35//
     36//  Output Containers:
     37//   MRawRunHeader, MRawEvtHeader, MRawEvtData, MRawCrateArray, MRawEvtTime
     38//
    3339////////////////////////////////////////////////////////////////////////
    3440
    … …  
    4652#include "MRawCrateArray.h"
    4753
    48 ClassImp(MRawFileRead)
     54ClassImp(MRawFileRead);
    4955
    5056

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

    r852 r859  
    3030//  root binary file to a root file. See also MRawFileRead
    3131//
     32//  Input Containers:
     33//   MRawRunHeader, MRawEvtHeader, MRawEvtData, MRawCrateArray, MRawEvtTime
     34//
     35//  Output Containers:
     36//   -/-
     37//
    3238////////////////////////////////////////////////////////////////////////
    3339
    … …  
    4753#include "MRawCrateArray.h"
    4854
    49 ClassImp(MRawFileWrite)
     55ClassImp(MRawFileWrite);
    5056
    5157// --------------------------------------------------------------------------

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

    r764 r859  
    3939#include "MArrayS.h"
    4040
    41 ClassImp(MRawRunHeader)
     41ClassImp(MRawRunHeader);
    4242
    4343// --------------------------------------------------------------------------

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx

    r847 r859  
    6060  Float_t GetPedestalRms(UInt_t i) const { return fElecNoise[i]; }
    6161
    62   const UInt_t GetNumPixel() const { return MFADC_CHANNELS; }
     62  UInt_t GetNumPixel() const { return MFADC_CHANNELS; }
    6363
    6464  ClassDef(MMcFadcHeader, 1)  //Stores Montecarlo Information describing the FADC behaviour

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx

    r847 r859  
    6262  }
    6363
    64   Int_t GetFirstLevel() {
     64  Int_t GetFirstLevel() const {
    6565    return ( fNumFirstLevel ); 
    6666  }
Note: See TracChangeset for help on using the changeset viewer.