Changeset 17641 for trunk/Mars/fact


Ignore:
Timestamp:
04/01/14 14:38:58 (11 years ago)
Author:
ftemme
Message:
Added the calculation of Disp and ThetaSq in the MC-Star macro and commented the lightpulser calibration in the MC-Callisto macro out
Location:
trunk/Mars/fact/analysis/mc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/fact/analysis/mc/callisto.C

    r17309 r17641  
    9292    Bool_t maximum = kTRUE;
    9393
    94     const char *lp_template    = maximum ?
    95         "/cm/shared/apps/fact/Mars_svn_LP/template-lp-extractor-maximum.root" :
    96         "/cm/shared/apps/fact/Mars_svn_LP/template-lp-extractor-leading-edge.root";
    97 
    98     const char *pulse_template = "/cm/shared/apps/fact/Mars_svn_LP/template-pulse.root";
     94    //const char *lp_template    = maximum ?
     95    //    "/cm/shared/apps/fact/Mars_svn_LP/template-lp-extractor-maximum.root" :
     96    //    "/cm/shared/apps/fact/Mars_svn_LP/template-lp-extractor-leading-edge.root";
     97
     98    const char *lp_template    = "/cm/shared/apps/fact/Mars_Trunk/template-lp.root";
     99
     100    //const char *pulse_template = "/cm/shared/apps/fact/Mars_svn_LP/template-pulse.root";
     101
     102    const char *pulse_template = "/cm/shared/apps/fact/Mars_Trunk/template-pulse.root";
    99103
    100104    // ------------------------------------------------------
     
    182186    lpref->SetDirectory(0);
    183187
    184     MHCamera *gain = (MHCamera*)arrt.FindObjectInCanvas("gain", "MHCamera", "Gain");
    185     if (!gain)
    186     {
    187         gLog << err << "ERROR - Gain not found in " << lp_template << endl;
    188         return 101;
    189     }
    190     gain->SetDirectory(0);
     188    // MHCamera *gain = (MHCamera*)arrt.FindObjectInCanvas("gain", "MHCamera", "Gain");
     189    // if (!gain)
     190    // {
     191    //     gLog << err << "ERROR - Gain not found in " << lp_template << endl;
     192    //     return 101;
     193    // }
     194    // gain->SetDirectory(0);
    191195
    192196    TFile fp(pulse_template);
  • trunk/Mars/fact/analysis/mc/star.C

    r17310 r17641  
    4242#include "MParameters.h"
    4343#include "MWriteAsciiFile.h"
     44#include "MFMagicCuts.h"
    4445
    4546#include "MMuonSetup.h"
     
    288289    write.AddContainer("MNewImagePar",    "Events");
    289290    write.AddContainer("MRawEvtHeader",   "Events");
     291    write.AddContainer("ThetaSquared",   "Events");
     292    write.AddContainer("Disp",           "Events");
    290293    write.AddContainer("MRawRunHeader",   "RunHeaders");
    291294    write.AddContainer("MGeomCam",        "RunHeaders");
     
    294297    fillmhn2.SetFilter(&fmuonhn);
    295298
     299    TArrayD param(12);
     300    // Parametrization of Disp
     301    param[0]  =  1.15136;     // constant
     302    param[8]  =  0.0681437;   // slope
     303    param[9]  =  2.62932;     // leak
     304    param[10] =  1.51279;     // size-offset
     305    param[11] =  0.0507821;   // size-slope
     306    // Parametrization for sign of disp (m3long, slope)
     307    param[5]  = -0.07;
     308    param[6]  =  7.2;
     309    param[7]  =  0.5;
     310    // ThetaSq-Cut
     311    param[1]  =  0.11;  // 0.215
     312    // Area-Cut
     313    param[2]  =  0.215468;
     314    param[3]  =  5.63973;
     315    param[4]  =  0.0836169;
     316    MFMagicCuts cuts;
     317    cuts.SetHadronnessCut(MFMagicCuts::kNoCut);
     318    cuts.SetVariables(param);
     319
     320
    296321    tlist.AddToList(&read);
    297322    tlist.AddToList(&cont);
     
    299324    tlist.AddToList(&clean);
    300325    tlist.AddToList(&hcalc);
     326    tlist.AddToList(&cuts);
    301327    tlist.AddToList(&fillC1);
    302328    tlist.AddToList(&fillC2);
Note: See TracChangeset for help on using the changeset viewer.