Changeset 1102 for trunk


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

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1101 r1102  
    55   * mmc/*.hxx:
    66     - Changed MPARCONTAINER_H to MARS_MParContainer
     7
     8   * meventdisp/MGCamDisplay.cc, mmain/MAnalysis.cc:
     9     - added MMcPedestalCopy to task list
     10     - added MMcPedestalNSB  to task list
     11
     12   * meventdisp/MGEvtDisplay.cc:
     13     - changed reader from MReadTree to MReadMarsFile
    714
    815

  • trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

    r1081 r1102  
    2525#include "MGCamDisplay.h"
    2626
    27 #include <TList.h>          // TList::Add
    28 #include <TCanvas.h>        // TCanvas::cd
    29 #include <TGButton.h>       // TGPictureButton
    30 #include <TGButtonGroup.h>  // TGVButtonGroup
    31 
    32 #include "MGTask.h"         // MGTask::CreateGui
    33 #include "MClone.h"         // MClone
    34 #include "MHillas.h"        // MHillas
    35 #include "MParList.h"       // MParList::AddToList
    36 #include "MEvtLoop.h"       // MEvtLoop::GetParList
    37 #include "MTaskList.h"      // MTaskList::AddToList
    38 #include "MCamDisplay.h"    // MCamDisplay
    39 #include "MHillasCalc.h"    // MHillasCalc
    40 #include "MPedestalCam.h"   // MPedestalCam
    41 #include "MCerPhotCalc.h"   // MCerPhotCalc
    42 #include "MImgCleanStd.h"   // MImgCleanStd
    43 #include "MGeomCamMagic.h"  // MGeomMagicCam
     27#include <TList.h>            // TList::Add
     28#include <TCanvas.h>          // TCanvas::cd
     29#include <TGButton.h>         // TGPictureButton
     30#include <TGButtonGroup.h>    // TGVButtonGroup
     31
     32#include "MGTask.h"           // MGTask::CreateGui
     33#include "MClone.h"           // MClone
     34#include "MHillas.h"          // MHillas
     35#include "MParList.h"         // MParList::AddToList
     36#include "MEvtLoop.h"         // MEvtLoop::GetParList
     37#include "MTaskList.h"        // MTaskList::AddToList
     38#include "MCamDisplay.h"      // MCamDisplay
     39#include "MHillasCalc.h"      // MHillasCalc
     40#include "MPedestalCam.h"     // MPedestalCam
     41#include "MCerPhotCalc.h"     // MCerPhotCalc
     42#include "MMcPedestalCopy.h"  // MMcPedestalCopy
     43#include "MMcPedestalNSB.h"   // MMcPedestalNSB
     44#include "MImgCleanStd.h"     // MImgCleanStd
     45#include "MGeomCamMagic.h"    // MGeomMagicCam
    4446
    4547ClassImp(MGCamDisplay);
    … …  
    7981     Bacause of some strage and hidden dependencies the
    8082     GetMaiFrame call in the destructor of TGButton may fail if some
    81      of the other gui elemts is deleted first.
     83     of the other gui elements are deleted first.
    8284     AddFirst adds the buttons at the beginning of the deletion list,
    8385     this seems to work.
    … …  
    113115    MParList  *plist = GetParList();
    114116
    115     MCerPhotCalc *ncalc = new MCerPhotCalc;
    116     MClone       *clone = new MClone("MCerPhotEvt");
    117     MImgCleanStd *clean = new MImgCleanStd;
    118     MHillasCalc  *hcalc = new MHillasCalc;
    119 
     117    MMcPedestalCopy *pcopy = new MMcPedestalCopy;
     118    MMcPedestalNSB  *pdnsb = new MMcPedestalNSB;
     119    MCerPhotCalc    *ncalc = new MCerPhotCalc;
     120    MClone          *clone = new MClone("MCerPhotEvt");
     121    MImgCleanStd    *clean = new MImgCleanStd;
     122    MHillasCalc     *hcalc = new MHillasCalc;
     123
     124    tlist->AddToList(pcopy);
     125    tlist->AddToList(pdnsb);
    120126    tlist->AddToList(ncalc);
    121127    tlist->AddToList(clone);

  • trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

    r1081 r1102  
    4343#include "MTaskList.h"
    4444#include "MEvtLoop.h"
    45 #include "MReadTree.h"
     45#include "MReadMarsFile.h"
    4646
    4747ClassImp(MGEvtDisplay);
    … …  
    8787MReadTree *MGEvtDisplay::GetReader() const
    8888{
    89     return (MReadTree*)GetTaskList()->FindObject("MReadTree");
     89    return (MReadTree*)GetTaskList()->FindObject("MReadMarsFile");
    9090}
    9191
    … …  
    380380    tlist->SetOwner();
    381381
    382     MReadTree *read = new MReadTree(tname, fname);
     382    MReadMarsFile *read = new MReadMarsFile(tname, fname);
    383383    tlist->AddToList(read);
    384384

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

    r1086 r1102  
    126126#include "MHStarMap.h"
    127127#include "MReadTree.h"
     128#include "MMcPedestalCopy.h"  // MMcPedestalCopy
     129#include "MMcPedestalNSB.h"   // MMcPedestalNSB
    128130#include "MCerPhotCalc.h"
    129131#include "MImgCleanStd.h"
    … …  
    179181    MReadTree read("Events", fInputFile);
    180182
    181     MCerPhotCalc ncalc;
    182     MHillasCalc  hcalc;
     183    MMcPedestalCopy pcopy;
     184    MMcPedestalNSB  pdnsb;
     185    MCerPhotCalc    ncalc;
     186    MHillasCalc     hcalc;
    183187
    184188    tlist.AddToList(&read);
     189    tlist.AddToList(&pcopy);
     190    tlist.AddToList(&pdnsb);
    185191    tlist.AddToList(&ncalc);
    186192    tlist.AddToList(fImgClean);
Note: See TracChangeset for help on using the changeset viewer.