Changeset 1647 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
11/19/02 13:31:21 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r1645 r1647  
    11                                                                  -*-*- END -*-*-
     2 2002/11/19: Thomas Bretz
     3
     4   * mmain/MMonteCarlo.cc:
     5     - exchanged MReadTree with MReadMarsFile for collection area calculation
     6 
     7   * mmontecarlo/MMcCollectionAreaCalc.cc:
     8     - fixed the uninitialized fTheta
     9
     10   * macros/MagicHillas.C:
     11     - removed the unnecessary second MHillasSrcCalc
     12     - removed also the corresponding AddToList for the tasklist
     13
     14
    215 2002/11/19: Abelardo Moralejo
     16
    317   * macros/collarea.C:
    418     - Added 2nd argument to write an output file containing the
    519       collection area histogram.
    620
     21
     22
    723 2002/11/18: Abelardo Moralejo
    824
     
    2238   * mgeom/MGeomPix.cc:
    2339     - fixed some typos in comments
     40
     41
    2442
    2543 2002/11/18: Thomas Bretz
     
    90108     - changed comments
    91109     - added missing manalysis-dir (strange!)
     110
     111   * macros/dohtml.C:
     112     - added new macros
    92113
    93114
  • trunk/MagicSoft/Mars/NEWS

    r1637 r1647  
    11                                                               -*-*- END -*-*-
     2
     3 *** Version 0.9
     4
     5   - added pedstal calculation
     6
     7   - implemented "democratic cleaning" (cut value proportional to square
     8     root of pixel area) according to Wolfgang's suggestion.
     9
     10
    211
    312 *** Version 0.8 (2002/11/18)
  • trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

    r1641 r1647  
    117117        const Float_t noise = pix.GetErrorPhot();
    118118
     119        const Int_t id = pix.GetPixId();
     120
     121        const Double_t ratio = TMath::Sqrt(fCam->GetPixRatio(id));
     122
    119123        // COBB: '<=' to skip entry=noise=0
    120         if (entry <= fCleanLvl1 * noise / sqrt(fCam->GetPixRatio(i)))
     124        if (entry <= fCleanLvl1 * noise / ratio)
    121125            pix.SetPixelUnused();
    122126
    123         if (pix.GetPixId()>max)
    124             max = pix.GetPixId();
     127        if (id>max)
     128            max = id;
    125129    }
    126130    return max;
     
    265269        const Float_t noise = pix.GetErrorPhot();
    266270
    267         if (entry <= fCleanLvl2 * noise / sqrt(fCam->GetPixRatio(i)))
    268             continue;
    269 
    270271        //
    271272        // get pixel id of this entry
    272273        //
    273274        const Int_t id = pix.GetPixId();
     275
     276        const Double_t ratio = TMath::Sqrt(fCam->GetPixRatio(id));
     277
     278        if (entry <= fCleanLvl2 * noise / ratio)
     279            continue;
    274280
    275281        //
Note: See TracChangeset for help on using the changeset viewer.