Changeset 7979


Ignore:
Timestamp:
09/28/06 10:05:44 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r7978 r7979  
    2424     - implemented a hadronness cut as an option
    2525     - updated class reference
     26     - fixed abug introduced 14.7.2005 which caused the M3Long of the
     27       anti source to be not properly evaluated in case of optimization.
    2628
    2729
  • trunk/MagicSoft/Mars/NEWS

    r7978 r7979  
    121121     cut in hadronness (index 8) and a fixed cut in size (index 9).
    122122
     123   - ganymed: MFMagicCuts: fixed abug introduced 2005/7/14 which caused
     124     the M3Long of the anti source to be not properly evaluated
     125     (actually is was evaluated as a unique random number) in case
     126     of optimization with anti-theta cut switched on. This might have
     127     lead to improper, but not necessarily wrong, optimization results.
    123128
    124129
  • trunk/MagicSoft/Mars/mfilter/MFMagicCuts.cc

    r7978 r7979  
    3333//      lgsize       = log10(MHillas.fSize)
    3434//
     35//      leakage1     = log10(MNewImagePar.fLeakage1+1)
     36//
    3537//      alpha        = MHillasSrc.fAlpha
    3638//      dist         = MHillasSrc.fDist*fMm2Deg
    37 //      leakage1     = log10(MNewImagePar.fLeakage1+1)
    38 //
    3939//      m3long       = MHillasExt.fM3Long*sign(MHillasSrc.fCosDeltaAlpha)*fMm2Deg
     40//
     41//      antialpha    = MHillasSrcAnti.fAlpha
     42//      antidist     = MHillasSrcAnti.fDist*fMm2Deg
    4043//      antim3long   = MHillasExt.fM3Long*sign(MHillasSrcAnti.fCosDeltaAlpha)*fMm2Deg
    4144//
     
    5154//          antidisp    = TMath::Sign(disp, antim3long-c[5])
    5255//          thetasq     = disp^2 + dist^2 - 2*disp*dist*alpha
    53 //          antithetasq = antidisp^2 + dist^2 - 2*antidisp*dist*alpha
     56//          antithetasq = antidisp^2 + antidist^2 - 2*antidisp*antidist*antialpha
    5457//
    5558//    c[1]:
     
    140143    AddToBranchList("MHillas.fSize");
    141144    AddToBranchList("MHillasSrc.fAlpha");
     145    AddToBranchList("MHillasSrc.fDist");
     146    AddToBranchList("MHillasSrc.fCosDeltaAlpha");
    142147    AddToBranchList("MHillasSrcAnti.fAlpha");
    143     AddToBranchList("MHillasExt.fMaxDist");
     148    AddToBranchList("MHillasSrcAnti.fDist");
     149    AddToBranchList("MHillasSrcAnti.fCosDeltaAlpha");
    144150    AddToBranchList("MHillasExt.fM3Long");
    145151    AddToBranchList("MNewImagePar.fLeakage1");
     
    270276    fMatrix = mat;
    271277
     278    fMap[kEWdivL]   = fMatrix->AddColumn("MHillas.fWidth/MHillas.fLength");
    272279    fMap[kESize]    = fMatrix->AddColumn("log10(MHillas.fSize)");
    273280    fMap[kEArea]    = fMatrix->AddColumn("MHillas.GetArea*MGeomCam.fConvMm2Deg*MGeomCam.fConvMm2Deg");
    274     fMap[kEM3Trans] = fMatrix->AddColumn("abs(MHillasExt.fM3Trans)*MGeomCam.fConvMm2Deg");
    275     fMap[kEM3Long]  = fMatrix->AddColumn("MHillasExt.fM3Long*sign(MHillasSrc.fCosDeltaAlpha)*MGeomCam.fConvMm2Deg");
    276     fMap[kESrcSign] = fMatrix->AddColumn("sign(MHillasSrc.fCosDeltaAlpha)");
    277     fMap[kEWdivL]   = fMatrix->AddColumn("MHillas.fWidth/MHillas.fLength");
     281
     282    fMap[kELeakage] = fMatrix->AddColumn("log10(MNewImagePar.fLeakage1+1)");
    278283
    279284    fMap[kEAlpha]   = fMatrix->AddColumn("MHillasSrc.fAlpha");
    280285    fMap[kEDist]    = fMatrix->AddColumn("MHillasSrc.fDist*MGeomCam.fConvMm2Deg");
    281     fMap[kELeakage] = fMatrix->AddColumn("log10(MNewImagePar.fLeakage1+1)");
     286    fMap[kEM3Long]  = fMatrix->AddColumn("MHillasExt.fM3Long*sign(MHillasSrc.fCosDeltaAlpha)*MGeomCam.fConvMm2Deg");
     287
     288    fMap[kESrcSign] = fMatrix->AddColumn("sign(MHillasSrc.fCosDeltaAlpha)");
    282289
    283290    if (fThetaCut&kOff)
     
    285292        fMap[kEAlphaAnti]  = fMatrix->AddColumn("MHillasSrcAnti.fAlpha");
    286293        fMap[kEDistAnti]   = fMatrix->AddColumn("MHillasSrcAnti.fDist*MGeomCam.fConvMm2Deg");
     294        fMap[kEM3LongAnti] = fMatrix->AddColumn("MHillasExt.fM3Long*sign(MHillasSrcAnti.fCosDeltaAlpha)*MGeomCam.fConvMm2Deg");
    287295    }
    288296
  • trunk/MagicSoft/Mars/mfilter/MFMagicCuts.h

    r7978 r7979  
    4242    // the last on in the list. It is used as counter for fMap.
    4343    enum {
    44         kESize, kEAlpha, kEAlphaAnti, kEArea, kEDist,
    45         kEM3Long, kEM3LongAnti, kEM3Trans, kEDistAnti, kEWdivL,
    46         kELeakage, kESrcSign, kEHadronness,
     44        kESize, kEAlpha, kEAlphaAnti, kEArea, kEDist, kEDistAnti,
     45        kEM3Long, kEM3LongAnti, kEWdivL, kELeakage, kESrcSign, kEHadronness,
    4746        kLastElement
    4847    };
Note: See TracChangeset for help on using the changeset viewer.