Changeset 4586 for trunk


Ignore:
Timestamp:
08/12/04 08:16:56 (20 years ago)
Author:
hbartko
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r4585 r4586  
    2020                                                 -*-*- END OF LINE -*-*-
    2121
     22    2004/08/12: Hendrik Bartko
     23    * msignal/MExtractor.[h,cc]:
     24      - add SetNamePedContainer to set the name of the pedestal
     25        container
     26
     27    * msignal/MExtractTime.[h,cc]:
     28      - add SetNamePedContainer to set the name of the pedestal
     29        container
     30
     31    * mbadpixels/MBadPixelsCalc.[h,cc]
     32      - add SetNamePedPhotContainer to set the name of the pedphot
     33        container
     34
     35    * mbadpixels/MBadPixelsTreat.[h,cc]
     36      - add SetNamePedPhotContainer to set the name of the pedphot
     37        container
     38
     39    * mimage/MImgCleanStd.[h,cc]
     40      - add SetNamePedPhotContainer to set the name of the pedphot
     41        container
    2242
    2343

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

    r4579 r4586  
    8585//
    8686MBadPixelsCalc::MBadPixelsCalc(const char *name, const char *title)
    87     : fPedestalLevel(3)
     87    : fPedestalLevel(3), fNamePedPhotContainer("MPedPhotCam")
    8888{
    8989    fName  = name  ? name  : gsDefName.Data();
    … …  
    102102    if (fPedestalLevel>0)
    103103    {
    104         fPedPhotCam = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
     104      fPedPhotCam = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer,  AddSerialNumber("MPedPhotCam"));
    105105        if (!fPedPhotCam)
    106106        {

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h

    r4527 r4586  
    2121
    2222    Float_t fPedestalLevel;
    23 
     23    TString fNamePedPhotContainer; // name of the 'MPedPhotCam' container
     24   
    2425    //    void CheckPedestalRMS() const;
    2526    Bool_t CheckPedestalRms() const;
    … …  
    3233
    3334    void SetPedestalLevel(Float_t f) { fPedestalLevel=f; }
     35    void SetNamePedPhotContainer(const char *name)    { fNamePedPhotContainer = name; }
    3436
    3537    ClassDef(MBadPixelsCalc, 1) // Task to find bad pixels (star, broken pixels, etc)

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

    r4559 r4586  
    8787//
    8888MBadPixelsTreat::MBadPixelsTreat(const char *name, const char *title)
    89     : fFlags(0), fNumMinNeighbors(3)
     89  : fFlags(0), fNumMinNeighbors(3), fNamePedPhotContainer("MPedPhotCam")
    9090{
    9191    fName  = name  ? name  : gsDefName.Data();
    … …  
    121121    }
    122122
    123     fPedPhot = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
     123    fPedPhot = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer, AddSerialNumber("MPedPhotCam"));
    124124    if (!fPedPhot)
    125125    {

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h

    r4559 r4586  
    2121    Byte_t fFlags;       // flag for the method which is used
    2222    Byte_t fNumMinNeighbors;
     23    TString fNamePedPhotContainer; // name of the 'MPedPhotCam' container
    2324
    2425    enum
    … …  
    6465    }
    6566    void SetNumMinNeighbors(Byte_t num) { fNumMinNeighbors=num; }
     67    void SetNamePedPhotContainer(const char *name)    { fNamePedPhotContainer = name; }
    6668
    6769

  • trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

    r4526 r4586  
    291291                           const char *name, const char *title)
    292292    : fCleaningMethod(kStandard), fCleanLvl1(lvl1),
    293     fCleanLvl2(lvl2), fCleanRings(1)
     293      fCleanLvl2(lvl2), fCleanRings(1), fNamePedPhotContainer("MPedPhotCam")
    294294
    295295{
    … …  
    510510    }
    511511
    512     fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
     512    fPed = (MPedPhotCam*)pList->FindObject(fNamePedPhotContainer, AddSerialNumber("MPedPhotCam"));
    513513    if (!fPed)
    514514    {

  • trunk/MagicSoft/Mars/mimage/MImgCleanStd.h

    r4452 r4586  
    3838
    3939    Float_t fInnerNoise;      //!
     40    TString fNamePedPhotContainer; // name of the 'MPedPhotCam' container
     41
    4042
    4143    void CreateGuiElements(MGGroupFrame *f);
    … …  
    6567
    6668    Bool_t ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2);
     69    void SetNamePedPhotContainer(const char *name)    { fNamePedPhotContainer = name; }
    6770
    6871    ClassDef(MImgCleanStd, 2)    // task doing the image cleaning

  • trunk/MagicSoft/Mars/msignal/MExtractTime.cc

    r4064 r4586  
    8383//
    8484MExtractTime::MExtractTime(const char *name, const char *title)
    85     : fArrTime(NULL)
     85  : fArrTime(NULL), fNamePedContainer("MPedestalCam")
    8686{
    8787
    … …  
    129129 
    130130
    131   fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     131  fPedestals = (MPedestalCam*)pList->FindObject(fNamePedContainer, AddSerialNumber("MPedestalCam"));
    132132  if (!fPedestals)
    133133    {

  • trunk/MagicSoft/Mars/msignal/MExtractTime.h

    r4273 r4586  
    1818
    1919  MArrivalTimeCam *fArrTime;            // Container with the photons arrival times
     20  TString fNamePedContainer; // name of the 'MPedestalCam' container
    2021 
     22
    2123  virtual Int_t PreProcess(MParList *pList);
    2224  virtual Bool_t ReInit(MParList *pList);
    … …  
    3335
    3436  void SetOffsetLoGain( const Float_t f=fgOffsetLoGain) { fOffsetLoGain = f; }
     37  void SetNamePedContainer(const char *name)    { fNamePedContainer = name; }
     38
    3539 
    3640  ClassDef(MExtractTime, 0)   // Arrival Time Extractor Base Class

  • trunk/MagicSoft/Mars/msignal/MExtractor.cc

    r4538 r4586  
    9191    : fPedestals(NULL), fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL),
    9292      fHiLoLast(0), fNumHiGainSamples(0.), fNumLoGainSamples(0.),
    93       fSaturationLimit(fgSaturationLimit)
     93      fSaturationLimit(fgSaturationLimit), fNamePedContainer("MPedestalCam")
    9494{
    9595    fName  = name  ? name  : "MExtractor";
    … …  
    143143        return kFALSE;
    144144
    145     fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     145    fPedestals = (MPedestalCam*)pList->FindObject(fNamePedContainer, AddSerialNumber("MPedestalCam"));
    146146    if (!fPedestals)
    147147    {

  • trunk/MagicSoft/Mars/msignal/MExtractor.h

    r4368 r4586  
    4646
    4747    Byte_t  fSaturationLimit;
     48    TString fNamePedContainer; // name of the 'MPedestalCam' container
    4849
    4950    virtual void FindSignalHiGain(Byte_t *firstused, Byte_t *lowgain, Float_t &sum, Byte_t &sat) const { }
    … …  
    6869    virtual void SetRange  (Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0);
    6970    void SetSaturationLimit(Byte_t lim=fgSaturationLimit) { fSaturationLimit = lim; }
     71    void SetNamePedContainer(const char *name)    { fNamePedContainer = name; }
    7072
    7173    ClassDef(MExtractor, 0) // Signal Extractor Base Class
Note: See TracChangeset for help on using the changeset viewer.