Changeset 1103 for trunk


Ignore:
Timestamp:
12/10/01 15:34:50 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1102 r1103  
    66     - Changed MPARCONTAINER_H to MARS_MParContainer
    77
    8    * meventdisp/MGCamDisplay.cc, mmain/MAnalysis.cc:
     8   * meventdisp/MGCamDisplay.cc:
    99     - added MMcPedestalCopy to task list
    1010     - added MMcPedestalNSB  to task list
     11
     12   * mmain/MAnalysis.cc:
     13     - added MMcPedestalCopy to task list
     14     - added MMcPedestalNSB  to task list
     15     - changed reader from MReadTree to MReadMarsFile
    1116
    1217   * meventdisp/MGEvtDisplay.cc:

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

    r1094 r1103  
    6565    //   CalEvents:  Calibration Events
    6666    //
    67     MReadTree read("Events", filename);
    68     MReadMarsFile  readhead("Events",filename);
     67    MReadMarsFile  read("Events",filename);
    6968    // read.AddFile("data/cer000019.root");
    7069
    71     MMcPedestalCopy pedestals;
    72     MMcPedestalNSB pedNSB;
    73     MCerPhotCalc ncalc;
    74     MImgCleanStd clean;
    75     MHillasCalc  hcalc;
    76     MFillH       hfill("MHillas", "MHHillas");
    77     MFillH       sfill("MHillas", "MHStarMap");
     70    MMcPedestalCopy pcopy;
     71    MMcPedestalNSB  pnsb;
     72    MCerPhotCalc    ncalc;
     73    MImgCleanStd    clean;
     74    MHillasCalc     hcalc;
     75    MFillH          hfill("MHillas", "MHHillas");
     76    MFillH          sfill("MHillas", "MHStarMap");
    7877
    7978    //
    … …  
    8584
    8685    tlist.AddToList(&read);
    87     tlist.AddToList(&readhead);
    88     tlist.AddToList(&pedestals);
    89     tlist.AddToList(&pedNSB);
     86    tlist.AddToList(&pcopy);
     87    tlist.AddToList(&pnsb);
    9088    tlist.AddToList(&ncalc);
    9189    tlist.AddToList(&clean);

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

    r1093 r1103  
    3838    plist.AddToList(&tlist);
    3939
    40     MReadTree    read("Events", "~/data/camera.root");
    41     MReadMarsFile    readhead("Events", "~/data/camera.root");
    42     MMcPedestalCopy pedestals;
    43     MMcPedestalNSB pedNSB;
    44     MCerPhotCalc ncalc;
    45     MClone       clone("MCerPhotEvt");
    46     MImgCleanStd clean;
    47     MHillasCalc  hcalc;
     40    MReadMarsFile   read("Events", "~/data/camera.root");
     41    MMcPedestalCopy pcopy;
     42    MMcPedestalNSB  pnsb;
     43    MCerPhotCalc    ncalc;
     44    MClone          clone("MCerPhotEvt");
     45    MImgCleanStd    clean;
     46    MHillasCalc     hcalc;
    4847
    4948    tlist.AddToList(&read);
    50     tlist.AddToList(&readhead);
    51     tlist.AddToList(&pedestals);
    52     tlist.AddToList(&pedNSB);
     49    tlist.AddToList(&pcopy);
     50    tlist.AddToList(&pnsb);
    5351    tlist.AddToList(&ncalc);
    5452    tlist.AddToList(&clone);

  • trunk/MagicSoft/Mars/mmain/MAnalysis.cc

    r1102 r1103  
    125125#include "MHHillas.h"
    126126#include "MHStarMap.h"
    127 #include "MReadTree.h"
     127#include "MReadMarsFile.h"
    128128#include "MMcPedestalCopy.h"  // MMcPedestalCopy
    129129#include "MMcPedestalNSB.h"   // MMcPedestalNSB
    … …  
    179179    //   CalEvents:  Calibration Events
    180180    //
    181     MReadTree read("Events", fInputFile);
     181    MReadMarsFile read("Events", fInputFile);
    182182
    183183    MMcPedestalCopy pcopy;
Note: See TracChangeset for help on using the changeset viewer.