Ignore:
Timestamp:
10/04/03 12:47:13 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/meventdisp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

    r2275 r2377  
    3838#include "MTaskList.h"           // MTaskList::AddToList
    3939#include "MHCamera.h"            // MHCamera
     40#include "MGeomApply.h"          // MGeomApply
    4041#include "MHillasCalc.h"         // MHillasCalc
    4142#include "MHillasSrcCalc.h"      // MHillasSrcCalc
     
    4344#include "MPedestalCam.h"        // MPedestalCam
    4445#include "MCerPhotEvt.h"         // MCerPhotEvt::GetPixById
    45 #include "MCerPhotCalc.h"       // MCerPhotCalc
     46#include "MCerPhotCalc.h"        // MCerPhotCalc
    4647#include "MMcPedestalCopy.h"     // MMcPedestalCopy
    4748#include "MMcPedestalNSBAdd.h"   // MMcPedestalNSBAdd
    4849#include "MBlindPixelCalc.h"     // MBlindPixelCalc
    4950#include "MImgCleanStd.h"        // MImgCleanStd
    50 #include "MGeomCamMagic.h"       // MGeomMagicCam
     51//#include "MGeomCamMagic.h"       // MGeomMagicCam
    5152#include "MRawEvtData.h"         // MRawEvtData
    5253
     
    116117//  preprocess tasks and read in first event (process)
    117118//
    118 MGeomCam *MGCamDisplay::SetupTaskList()
     119void /*MGeomCam */MGCamDisplay::SetupTaskList()
    119120{
    120121    MTaskList *tlist = GetTaskList();
    121122    MParList  *plist = GetParList();
    122123
     124    MGeomApply        *apply = new MGeomApply;
    123125    MMcPedestalCopy   *pcopy = new MMcPedestalCopy;
    124126    MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
     
    130132    MHillasSrcCalc    *scalc = new MHillasSrcCalc;
    131133
     134    tlist->AddToList(apply);
    132135    tlist->AddToList(pcopy);
    133136    tlist->AddToList(pdnsb);
     
    139142    tlist->AddToList(scalc);
    140143
    141     MGeomCamMagic *geom   = new MGeomCamMagic;
     144    // MGeomCamMagic *geom   = new MGeomCamMagic;
    142145    MPedestalCam  *pedest = new MPedestalCam;
    143146    MRawEvtData   *event  = new MRawEvtData;
    144147
    145     plist->AddToList(geom);
     148    // plist->AddToList(geom);
    146149    plist->AddToList(pedest);
    147150    plist->AddToList(event);
    148151
    149     return geom;
     152    // return NULL;
    150153}
    151154
     
    161164    // Setup Task list for hillas calculation
    162165    //
    163     MGeomCam *geom = SetupTaskList();
     166    /*MGeomCam *geom = */SetupTaskList();
    164167
    165168    //
     
    181184    {
    182185        fCanvas2[i]->cd();
    183         fDisplay[i] = new MHCamera(*geom);
     186        fDisplay[i] = new MHCamera;//(*geom);
    184187        fDisplay[i]->Draw();
    185188        fDisplay[i]->AddNotify(*(MCamEvent*)GetParList()->FindObject("MRawEvtData"));
     
    221224//  together with the hillas ellipse or not.
    222225//
     226#include <iostream.h>
    223227void MGCamDisplay::UpdateDisplay()
    224228{
     
    227231
    228232    const MParList *plist = fEvtLoop->GetParList();
     233
     234    if (!fDisplay[0]->GetGeometry())
     235    {
     236        MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
     237        for (int i=0; i<5; i++)
     238        {
     239            fDisplay[i]->SetGeometry(*cam);
     240            cout << "---> Setting geometry for: " << fDisplay[i]->GetName() << endl;
     241        }
     242    }
    229243
    230244    //
     
    257271    const MPedestalCam *ped   = (MPedestalCam*)plist->FindObject("MPedestalCam");
    258272
     273    const Int_t n = ped->GetSize();
     274
    259275    // FIXME: Make this publicly available
    260     TArrayD val(577);
    261     TArrayC use(577);
    262     for (int i=0; i<577;i++)
     276    TArrayD val(n);
     277    TArrayC use(n);
     278    for (int i=0; i<n;i++)
    263279    {
    264280        // FIXME: photon event first!
  • trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h

    r2210 r2377  
    2525    void UpdateDisplay();
    2626
    27     MGeomCam *SetupTaskList();
     27    void /*MGeomCam */SetupTaskList();
    2828
    2929public:
  • trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

    r2275 r2377  
    278278
    279279    AddTab("Geometry");
     280
    280281    MGeomCamMagic geom;
    281282    MHCamera *display = new MHCamera(geom);
Note: See TracChangeset for help on using the changeset viewer.