Changeset 7979
- Timestamp:
- 09/28/06 10:05:44 (18 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r7978 r7979 24 24 - implemented a hadronness cut as an option 25 25 - 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. 26 28 27 29 -
trunk/MagicSoft/Mars/NEWS
r7978 r7979 121 121 cut in hadronness (index 8) and a fixed cut in size (index 9). 122 122 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. 123 128 124 129 -
trunk/MagicSoft/Mars/mfilter/MFMagicCuts.cc
r7978 r7979 33 33 // lgsize = log10(MHillas.fSize) 34 34 // 35 // leakage1 = log10(MNewImagePar.fLeakage1+1) 36 // 35 37 // alpha = MHillasSrc.fAlpha 36 38 // dist = MHillasSrc.fDist*fMm2Deg 37 // leakage1 = log10(MNewImagePar.fLeakage1+1)38 //39 39 // m3long = MHillasExt.fM3Long*sign(MHillasSrc.fCosDeltaAlpha)*fMm2Deg 40 // 41 // antialpha = MHillasSrcAnti.fAlpha 42 // antidist = MHillasSrcAnti.fDist*fMm2Deg 40 43 // antim3long = MHillasExt.fM3Long*sign(MHillasSrcAnti.fCosDeltaAlpha)*fMm2Deg 41 44 // … … 51 54 // antidisp = TMath::Sign(disp, antim3long-c[5]) 52 55 // thetasq = disp^2 + dist^2 - 2*disp*dist*alpha 53 // antithetasq = antidisp^2 + dist^2 - 2*antidisp*dist*alpha56 // antithetasq = antidisp^2 + antidist^2 - 2*antidisp*antidist*antialpha 54 57 // 55 58 // c[1]: … … 140 143 AddToBranchList("MHillas.fSize"); 141 144 AddToBranchList("MHillasSrc.fAlpha"); 145 AddToBranchList("MHillasSrc.fDist"); 146 AddToBranchList("MHillasSrc.fCosDeltaAlpha"); 142 147 AddToBranchList("MHillasSrcAnti.fAlpha"); 143 AddToBranchList("MHillasExt.fMaxDist"); 148 AddToBranchList("MHillasSrcAnti.fDist"); 149 AddToBranchList("MHillasSrcAnti.fCosDeltaAlpha"); 144 150 AddToBranchList("MHillasExt.fM3Long"); 145 151 AddToBranchList("MNewImagePar.fLeakage1"); … … 270 276 fMatrix = mat; 271 277 278 fMap[kEWdivL] = fMatrix->AddColumn("MHillas.fWidth/MHillas.fLength"); 272 279 fMap[kESize] = fMatrix->AddColumn("log10(MHillas.fSize)"); 273 280 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)"); 278 283 279 284 fMap[kEAlpha] = fMatrix->AddColumn("MHillasSrc.fAlpha"); 280 285 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)"); 282 289 283 290 if (fThetaCut&kOff) … … 285 292 fMap[kEAlphaAnti] = fMatrix->AddColumn("MHillasSrcAnti.fAlpha"); 286 293 fMap[kEDistAnti] = fMatrix->AddColumn("MHillasSrcAnti.fDist*MGeomCam.fConvMm2Deg"); 294 fMap[kEM3LongAnti] = fMatrix->AddColumn("MHillasExt.fM3Long*sign(MHillasSrcAnti.fCosDeltaAlpha)*MGeomCam.fConvMm2Deg"); 287 295 } 288 296 -
trunk/MagicSoft/Mars/mfilter/MFMagicCuts.h
r7978 r7979 42 42 // the last on in the list. It is used as counter for fMap. 43 43 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, 47 46 kLastElement 48 47 };
Note:
See TracChangeset
for help on using the changeset viewer.