Ignore:
Timestamp:
06/23/03 12:09:05 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mimage
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r2173 r2209  
    6666//  - get MGeomCam from the parameter list
    6767//
    68 Bool_t MCameraSmooth::PreProcess (MParList *pList)
     68Int_t MCameraSmooth::PreProcess (MParList *pList)
    6969{
    7070    fEvt = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt");
    … …  
    8989// Do the smoothing
    9090//
    91 Bool_t MCameraSmooth::Process()
     91Int_t MCameraSmooth::Process()
    9292{
    9393    const UShort_t entries = fEvt->GetNumPixels();

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

    r1940 r2209  
    2323    Bool_t fUseCentralPixel;  // use also the central pixel
    2424
     25    Int_t PreProcess(MParList *pList);
     26    Int_t Process();
     27
    2528public:
    2629    MCameraSmooth(Byte_t cnt=1, const char *name=NULL, const char *title=NULL);
    2730
    2831    void SetUseCetralPixel(Bool_t b=kTRUE) { fUseCentralPixel=kTRUE; }
    29 
    30     Bool_t PreProcess(MParList *pList);
    31     Bool_t Process();
    3232
    3333    ClassDef(MCameraSmooth, 0) // task to smooth the camera contants

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

    r2173 r2209  
    9090// MNewImagePar, too.
    9191//
    92 Bool_t MHillasCalc::PreProcess(MParList *pList)
     92Int_t MHillasCalc::PreProcess(MParList *pList)
    9393{
    9494    // necessary
    … …  
    147147// If the calculation wasn't sucessfull skip this event
    148148//
    149 Bool_t MHillasCalc::Process()
     149Int_t MHillasCalc::Process()
    150150{
    151151    if (TestFlag(kCalcHillas))
    … …  
    176176//  is calculated with respect to the number of executions of this task.
    177177//
    178 Bool_t MHillasCalc::PostProcess()
     178Int_t MHillasCalc::PostProcess()
    179179{
    180180    if (GetNumExecutions()==0)

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

    r2100 r2209  
    3737    Int_t        fFlags;
    3838
    39     Bool_t PreProcess(MParList *pList);
    40     Bool_t Process();
    41     Bool_t PostProcess();
     39    Int_t PreProcess(MParList *pList);
     40    Int_t Process();
     41    Int_t PostProcess();
    4242
    4343public:

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

    r2173 r2209  
    7272// -------------------------------------------------------------------------
    7373//
    74 Bool_t MHillasSrcCalc::PreProcess(MParList *pList)
     74Int_t MHillasSrcCalc::PreProcess(MParList *pList)
    7575{
    7676    fHillas = (MHillas*)pList->FindObject(fHillasInput, "MHillas");
    … …  
    103103// -------------------------------------------------------------------------
    104104//
    105 Bool_t MHillasSrcCalc::Process()
     105Int_t MHillasSrcCalc::Process()
    106106{
    107107
    … …  
    120120//  is calculated with respect to the number of executions of this task.
    121121//
    122 Bool_t MHillasSrcCalc::PostProcess()
     122Int_t MHillasSrcCalc::PostProcess()
    123123{
    124124    if (GetNumExecutions()==0)

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

    r2004 r2209  
    2525    void StreamPrimitive(ofstream &out) const;
    2626
    27     Bool_t PreProcess(MParList *plist);
    28     Bool_t Process();
    29     Bool_t PostProcess();
     27    Int_t PreProcess(MParList *plist);
     28    Int_t Process();
     29    Int_t PostProcess();
    3030
    3131public:

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

    r2173 r2209  
    316316//  Returns the maximum Pixel Id (used for ispixused in CleanStep2)
    317317//
    318 Int_t MImgCleanStd::CleanStep1Std()
     318void MImgCleanStd::CleanStep1Std()
    319319{
    320320    const Int_t entries = fEvt->GetNumPixels();
    321 
    322     Int_t max = entries;
    323321
    324322    //
    … …  
    339337        if (entry * ratio <= fCleanLvl1 * noise)
    340338            pix.SetPixelUnused();
    341 
    342         if (id>max)
    343             max = id;
    344     }
    345 
    346     return max;
     339    }
    347340}
    348341
    … …  
    358351//  Returns the maximum Pixel Id (used for ispixused in CleanStep2)
    359352//
    360 Int_t MImgCleanStd::CleanStep1Dem()
     353void MImgCleanStd::CleanStep1Dem()
    361354{
    362355    const Int_t entries = fEvt->GetNumPixels();
    363 
    364     Int_t max = entries;
    365356
    366357    //
    … …  
    380371        if (entry * ratio <= fCleanLvl1 * fInnerNoise)
    381372            pix.SetPixelUnused();
    382 
    383         if (id>max)
    384             max = id;
    385     }
    386     return max;
     373    }
    387374}
    388375
    … …  
    394381// Returns the maximum Pixel Id (used for ispixused in CleanStep2)
    395382//
    396 Int_t MImgCleanStd::CleanStep1()
     383void MImgCleanStd::CleanStep1()
    397384{
    398385   switch (fCleaningMethod)
    399386    {
    400387    case kStandard:
    401         return CleanStep1Std();
     388        CleanStep1Std();
     389        return;
    402390    case kDemocratic:
    403         return CleanStep1Dem();
    404     }
    405 
    406     return 0;
     391        CleanStep1Dem();
     392        return;
     393    }
    407394}
    408395
    … …  
    415402//  Takes the maximum pixel id from CleanStep1 as an argument
    416403//
    417 void MImgCleanStd::CleanStep2(Int_t max)
     404void MImgCleanStd::CleanStep2()
    418405{
    419406    const Int_t entries = fEvt->GetNumPixels();
    … …  
    425412    // (MCerPhotEvt::IsPixelUsed) all the time.
    426413    //
    427     Byte_t *ispixused = new Byte_t[max+1];
     414    Byte_t *ispixused = new Byte_t[fCam->GetNumPixels()];
    428415
    429416    for (Int_t i=0; i<entries; i++)
    … …  
    463450            }
    464451        }
    465        
     452
    466453        if (hasNeighbor == kFALSE)
    467454            pix.SetPixelUnused();
    … …  
    640627//  if not create one and add them to the list
    641628//
    642 Bool_t MImgCleanStd::PreProcess (MParList *pList)
     629Int_t MImgCleanStd::PreProcess (MParList *pList)
    643630{
    644631    fCam = (MGeomCam*)pList->FindObject("MGeomCam");
    … …  
    673660// Cleans the image.
    674661//
    675 Bool_t MImgCleanStd::Process()
     662Int_t MImgCleanStd::Process()
    676663{
    677664    if (fSgb)
    678665        fInnerNoise = fSgb->GetSigmabarInner();
    679666
    680     const Int_t max = CleanStep1();
    681     CleanStep2(max);
     667    CleanStep1();
     668    CleanStep2();
    682669    CleanStep3();
    683670

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

    r2052 r2209  
    3838    void StreamPrimitive(ofstream &out) const;
    3939
    40     Int_t  CleanStep1Dem();
    41     Int_t  CleanStep1Std();
     40    void   CleanStep1Dem();
     41    void   CleanStep1Std();
    4242    Bool_t CleanStep3Dem(const MCerPhotPix &pix);
    4343    Bool_t CleanStep3Std(const MCerPhotPix &pix);
    … …  
    4545    void   CleanStep4(UShort_t r, MCerPhotPix &pix);
    4646
     47    void  CleanStep1();
     48    void  CleanStep2();
     49    void  CleanStep3();
     50
     51    Int_t PreProcess(MParList *pList);
     52    Int_t Process();
     53
    4754public:
    4855    MImgCleanStd(const Float_t lvl1=3.0, const Float_t lvl2=2.5,
    4956              const char *name=NULL, const char *title=NULL);
    50 
    51     Int_t CleanStep1();
    52     void  CleanStep2(Int_t max);
    53     void  CleanStep3();
    54 
    55     Bool_t PreProcess(MParList *pList);
    56     Bool_t Process();
    57 
    5857    void Print(Option_t *o="") const;
    5958

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

    r2026 r2209  
    7272// -------------------------------------------------------------------------
    7373//
    74 Bool_t MNewImageParCalc::PreProcess(MParList *pList)
     74Int_t MNewImageParCalc::PreProcess(MParList *pList)
    7575{
    7676    fHillas = (MHillas*)pList->FindObject(fHillasInput, "MHillas");
    … …  
    113113// -------------------------------------------------------------------------
    114114//
    115 Bool_t MNewImageParCalc::Process()
     115Int_t MNewImageParCalc::Process()
    116116{
    117117

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

    r2026 r2209  
    2828    //Int_t       fErrors;
    2929
    30     Bool_t PreProcess(MParList *plist);
    31     Bool_t Process();
     30    Int_t PreProcess(MParList *plist);
     31    Int_t Process();
    3232    //Bool_t PostProcess();
    3333
Note: See TracChangeset for help on using the changeset viewer.