Changeset 6026 for trunk


Ignore:
Timestamp:
01/26/05 14:55:43 (20 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r6025 r6026  
    2222 2005/01/26 Abelardo Moralejo
    2323
     24   * macros/mccalibrate.C
     25     - removed creation and writing out of MSrcPosCam. It is more
     26       flexible to add it in starmc2.C if needed (for wobble mode for
     27       instance).
     28
    2429   * mtemp/mpadova/macros/RanForestDISP.C
    2530     - added possibility to set the number of hadrons read in for the
    … …  
    3035
    3136   * macros/starmc2.C
    32      - added missing container MImagePar
     37     - added missing container MImagePar. Added possibility to set the
     38       source position on the camera (for the wobble mode).
    3339
    3440

  • trunk/MagicSoft/Mars/macros/mccalibrate.C

    r5021 r6026  
    4444  // ------------- user change -----------------
    4545  TString* CalibrationFilename;
    46   CalibrationFilename = new TString("../gammas_nonoise/Gamma_zbin0_0*.root");  // File to be used for the calibration (must be a camera file without added noise)
    47 
    48   Char_t* AnalysisFilename = "Gamma_zbin9_90_7_1740to1749_w0.root";  // File to be analyzed
    49 
    50   Char_t* OutFilename      = "calibrated_data.root";  // Output file name
    51 
    52 
    53   MExtractSignal    sigextract; 
     46
     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/Proton_*.root";  // File to be analyzed
     50
     51  Char_t* OutFilename      = "calibrated_gamma.root";  // Output file name
     52
     53
     54  //  MExtractSignal    sigextract; 
    5455  // (other extraction methods can be used)
    55 
    56   sigextract.SetSaturationLimit(240);
     56  //  sigextract.SetSaturationLimit(240);
    5757  // Defines when to switch to low gain
    58 
    5958  // Define FADC slices to be integrated in high and low gain:
    60   sigextract.SetRange(5, 10, 5, 10);
     59  //  sigextract.SetRange(5, 10, 5, 10);
     60
     61  MExtractFixedWindowPeakSearch sigextract;
     62  sigextract.SetWindows(6, 6, 4);
     63
    6164
    6265  // ---------------------------------------------------------------------
    … …  
    7073
    7174  plist.AddToList(&tlist);
    72 
    73   MSrcPosCam src;
    74   src.SetReadyToSave();
    75   plist.AddToList(&src);
    7675
    7776  MBadPixelsCam badpix;
    … …  
    150149  write.AddContainer("MMcTrigHeader",       "RunHeaders");
    151150  write.AddContainer("MRawRunHeader",       "RunHeaders");
    152   write.AddContainer("MSrcPosCam",          "RunHeaders");
    153151
    154152

  • trunk/MagicSoft/Mars/macros/starmc2.C

    r6023 r6026  
    6363
    6464  MSrcPosCam src;
     65  //
     66  // FOR WOBBLE MODE!! Set source position on camera here.
     67  //  src.SetX(120.);  // units: mm
     68
    6569  src.SetReadyToSave();
    6670
    … …  
    9498  //
    9599  write1.AddContainer("MRawRunHeader", "RunHeaders");
    96   write1.AddContainer("MMcRunHeader",  "RunHeaders", kFALSE);
    97   write1.AddContainer("MSrcPosCam",    "RunHeaders");
     100  write1.AddContainer("MMcRunHeader",  "RunHeaders", kFALSE);
    98101  write1.AddContainer("MGeomCam",      "RunHeaders", kFALSE);
    99102  write1.AddContainer("MMcConfigRunHeader",  "RunHeaders", kFALSE);
    … …  
    105108  write1.AddContainer("MPointingPos",  "Events", kFALSE);
    106109  write1.AddContainer("MMcTrig",       "Events", kFALSE);
     110  write1.AddContainer("MSrcPosCam",    "Events", kFALSE);
    107111  write1.AddContainer("MRawEvtHeader", "Events");
    108112  write1.AddContainer("MHillas",       "Events");
    … …  
    117121      write2.AddContainer("MRawRunHeader", "RunHeaders");
    118122      write2.AddContainer("MMcRunHeader",  "RunHeaders", kFALSE);
    119       write2.AddContainer("MSrcPosCam",    "RunHeaders");
    120123      write2.AddContainer("MGeomCam",      "RunHeaders", kFALSE);
    121124      write2.AddContainer("MMcConfigRunHeader",  "RunHeaders", kFALSE);
    … …  
    127130      write2.AddContainer("MPointingPos",  "Events", kFALSE);
    128131      write2.AddContainer("MMcTrig",       "Events", kFALSE);
     132      write2.AddContainer("MSrcPosCam",    "Events", kFALSE);
    129133      write2.AddContainer("MRawEvtHeader", "Events");
    130134      write2.AddContainer("MHillas",       "Events");
    … …  
    166170  evtloop.SetParList(&plist);
    167171
    168   if (!evtloop.Eventloop())
     172  if (!evtloop.Eventloop(10000))
    169173    return;
    170174
Note: See TracChangeset for help on using the changeset viewer.