Changeset 1861


Ignore:
Timestamp:
03/24/03 09:45:43 (22 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r1860 r1861  
    11                                                 -*-*- END OF LINE -*-*-
     2 2003/03/24: Abelardo Moralejo
     3
     4    * manalysis/MEnergyEstParam.cc
     5      - now energy estimation (for CT1) is done using the same model
     6        as in D.Krannich's thesis.
     7
    28 2003/03/21: Thomas Hengstebeck
    39 
  • trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc

    r1852 r1861  
    8888//
    8989// Default constructor. Give the name of the parameter container (MHillas)
    90 // storing wisth, length and size (Default="MHillas").
     90// storing width, length and size (Default="MHillas").
    9191// For the Zenith Angle MMcEvt.fTheta is used.
    9292//
     
    273273// Add a pair of input/output containers.
    274274//   eg. Add("MHillasSrc", "MEnergyEst");
    275 // Usefull if you want to estimate the stuff for the source and antisource
     275// Useful if you want to estimate the stuff for the source and antisource
    276276//
    277277void MEnergyEstParam::Add(const TString hillas, const TString energy)
     
    308308    const Double_t i1 = fA[0] + fA[2]*width;
    309309
     310
    310311    const Double_t e0 = k2 * (fB[6]*k2+1)/(fB[6]+1);
    311312
     
    315316
    316317    /* MARCOS */
     318    /*
    317319    const Double_t e1 = fB[0] + fB[1]*size + fB[3]*length + fB[4]*size*length;
     320    const Double_t e2 = fB[2] + fB[5]*length;
     321    */
     322
     323    /* DANIEL */
     324    const Double_t e1 = fB[0] + fB[1]*size/(length*width) +
     325      fB[3]*length + fB[4]*size/width;
     326
    318327    const Double_t e2 = fB[2] + fB[5]*length;
    319328
     
    332341
    333342
    334         /* MARCOS */
     343        /* DANIEL - MARCOS */
    335344        const Double_t ir = i0 * (i1 + fA[1]*dist); // [cm]
    336         /*const*/ Double_t er = e0 * (e1 + e2*0/*ir*/);      // [GeV]
     345        Double_t er = e0 * (e1 + e2*ir);       // [GeV]
     346
    337347
    338348        /* MY PARAM */
    339349        // if (width==0) return kCONTINUE;
    340         //const Double_t ir = i0 * (i1 + dist*(fA[1]/width + fA[4]/log10(size))); // [cm]
     350        // const Double_t ir = i0 * (i1 + dist*(fA[1]/width + fA[4]/log10(size))); // [cm]
    341351        //Double_t er = e0 * (e1 + e2*ir);      // [GeV]
    342352
Note: See TracChangeset for help on using the changeset viewer.