Changeset 6357


Ignore:
Timestamp:
02/10/05 17:33:56 (20 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r6350 r6357  
    2121
    2222                                                 -*-*- END OF LINE -*-*-
     23
     24 2005/02/10 Abelardo Moralejo
     25
     26   * macros/mccalibrate.C
     27     - Added possibility to calibrate in photons or photoelectrons
     28
     29   * macros/starmc2.C
     30     - Added comment about value of cleaning levels
     31
    2332
    2433 2005/02/10 Markus Gaug
  • trunk/MagicSoft/Mars/macros/mccalibrate.C

    r6027 r6357  
    4545  TString* CalibrationFilename;
    4646
    47   CalibrationFilename = new TString("/data1/magic/mc_data/root/Period021_0.73_mirror/gammas_nonoise/Gamma_*root");  // File to be used for the calibration (must be a camera file without added noise)
    48 
    49   Char_t* AnalysisFilename = "/data1/magic/mc_data/root/Period021_0.73_mirror/gammas_wobble/used/Gamma_*.root";  // File to be analyzed
     47  CalibrationFilename = new TString("/users/emc/moralejo/mcdata/Period021_0.73_mirror/gammas_nonoise/Gamma_*root");  // File to be used for the calibration (must be a camera file without added noise)
     48
     49  Char_t* AnalysisFilename = "Gamma_*.root";  // File to be analyzed
    5050
    5151  Char_t* OutFilename      = "calibrated_gamma.root";  // Output file name
    5252
    5353
    54   //  MExtractSignal    sigextract; 
    5554  // (other extraction methods can be used)
    56   //  sigextract.SetSaturationLimit(240);
    57   // Defines when to switch to low gain
    58   // Define FADC slices to be integrated in high and low gain:
    59   //  sigextract.SetRange(5, 10, 5, 10);
    60 
    61   MExtractFixedWindowPeakSearch sigextract;
    62   sigextract.SetWindows(6, 6, 4);
    63 
    64 
     55  //    MExtractFixedWindowPeakSearch sigextract;
     56  //    sigextract.SetWindows(6, 6, 4);
     57
     58  MExtractTimeAndChargeDigitalFilter sigextract;
     59  sigextract.SetNameWeightsFile("/users/emc/moralejo/Mars/msignal/MC_weights.dat");
     60  sigextract.SetRange(1, 14, 3, 14);
     61
     62
     63  MMcCalibrationUpdate  mccalibupdate;
     64  ///// User change: calibrate in photons or phe- :
     65  mccalibupdate.SetSignalType(MCalibrateData::kPhe);
     66  //  mccalibupdate.SetSignalType(MCalibrateData::kPhot);
    6567
    6668  // ---------------------------------------------------------------------
     
    100102  // Creates MPointingPos object and fill it with the telescope orientation
    101103  // information taken from MMcEvt.
    102 
    103   MMcCalibrationUpdate  mccalibupdate;
    104104
    105105  MCalibrateData calib;
     
    111111
    112112  calib.SetCalibrationMode(MCalibrateData::kFfactor);
     113  // Do not change the CalibrationMode above for MC...!
     114
     115  // Now set also whether to calibrate in photons or phe-:
     116  calib.SetSignalType(mccalibupdate.GetSignalType());
    113117
    114118  MImgCleanStd clean;
  • trunk/MagicSoft/Mars/macros/starmc2.C

    r6250 r6357  
    3838void starmc2()
    3939{
    40   Char_t* AnalysisFilename = "../calibrated_gamma.root"; // File to be analyzed
     40  Char_t* AnalysisFilename = "calibrated_gamma.root"; // File to be analyzed
    4141
    4242  TString* OutFilename1;
     
    4848  OutFilename2 = new TString("star_gamma_test.root");    // Output file name 2 (train)
    4949
    50   Float_t CleanLev[2] = {3., 2.}; // Tail cuts for image analysis
     50  MImgCleanStd      clean(4.5, 3.); // Applies tail cuts to image.
     51  // WARNING: the tightness of the tail cuts depends on the signal extraction method
     52  // used in mccalibrate.C!! (some methods result in positively biased signals)
    5153
    5254  // ------------------------------------------------------------------
     
    8183  read.DisableAutoScheme();
    8284
    83   MImgCleanStd      clean(CleanLev[0], CleanLev[1]); // Applies tail cuts to image.
    8485
    8586  MHillasCalc       hcalc; // Calculates Hillas parameters not dependent on source position.
Note: See TracChangeset for help on using the changeset viewer.