Changeset 2377 for trunk/MagicSoft/Mars/meventdisp
- Timestamp:
- 10/04/03 12:47:13 (21 years ago)
- Location:
- trunk/MagicSoft/Mars/meventdisp
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc
r2275 r2377 38 38 #include "MTaskList.h" // MTaskList::AddToList 39 39 #include "MHCamera.h" // MHCamera 40 #include "MGeomApply.h" // MGeomApply 40 41 #include "MHillasCalc.h" // MHillasCalc 41 42 #include "MHillasSrcCalc.h" // MHillasSrcCalc … … 43 44 #include "MPedestalCam.h" // MPedestalCam 44 45 #include "MCerPhotEvt.h" // MCerPhotEvt::GetPixById 45 #include "MCerPhotCalc.h" // MCerPhotCalc46 #include "MCerPhotCalc.h" // MCerPhotCalc 46 47 #include "MMcPedestalCopy.h" // MMcPedestalCopy 47 48 #include "MMcPedestalNSBAdd.h" // MMcPedestalNSBAdd 48 49 #include "MBlindPixelCalc.h" // MBlindPixelCalc 49 50 #include "MImgCleanStd.h" // MImgCleanStd 50 #include "MGeomCamMagic.h" // MGeomMagicCam51 //#include "MGeomCamMagic.h" // MGeomMagicCam 51 52 #include "MRawEvtData.h" // MRawEvtData 52 53 … … 116 117 // preprocess tasks and read in first event (process) 117 118 // 118 MGeomCam *MGCamDisplay::SetupTaskList()119 void /*MGeomCam */MGCamDisplay::SetupTaskList() 119 120 { 120 121 MTaskList *tlist = GetTaskList(); 121 122 MParList *plist = GetParList(); 122 123 124 MGeomApply *apply = new MGeomApply; 123 125 MMcPedestalCopy *pcopy = new MMcPedestalCopy; 124 126 MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd; … … 130 132 MHillasSrcCalc *scalc = new MHillasSrcCalc; 131 133 134 tlist->AddToList(apply); 132 135 tlist->AddToList(pcopy); 133 136 tlist->AddToList(pdnsb); … … 139 142 tlist->AddToList(scalc); 140 143 141 MGeomCamMagic *geom = new MGeomCamMagic;144 // MGeomCamMagic *geom = new MGeomCamMagic; 142 145 MPedestalCam *pedest = new MPedestalCam; 143 146 MRawEvtData *event = new MRawEvtData; 144 147 145 plist->AddToList(geom);148 // plist->AddToList(geom); 146 149 plist->AddToList(pedest); 147 150 plist->AddToList(event); 148 151 149 return geom;152 // return NULL; 150 153 } 151 154 … … 161 164 // Setup Task list for hillas calculation 162 165 // 163 MGeomCam *geom =SetupTaskList();166 /*MGeomCam *geom = */SetupTaskList(); 164 167 165 168 // … … 181 184 { 182 185 fCanvas2[i]->cd(); 183 fDisplay[i] = new MHCamera (*geom);186 fDisplay[i] = new MHCamera;//(*geom); 184 187 fDisplay[i]->Draw(); 185 188 fDisplay[i]->AddNotify(*(MCamEvent*)GetParList()->FindObject("MRawEvtData")); … … 221 224 // together with the hillas ellipse or not. 222 225 // 226 #include <iostream.h> 223 227 void MGCamDisplay::UpdateDisplay() 224 228 { … … 227 231 228 232 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 } 229 243 230 244 // … … 257 271 const MPedestalCam *ped = (MPedestalCam*)plist->FindObject("MPedestalCam"); 258 272 273 const Int_t n = ped->GetSize(); 274 259 275 // 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++) 263 279 { 264 280 // FIXME: photon event first! -
trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h
r2210 r2377 25 25 void UpdateDisplay(); 26 26 27 MGeomCam *SetupTaskList();27 void /*MGeomCam */SetupTaskList(); 28 28 29 29 public: -
trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc
r2275 r2377 278 278 279 279 AddTab("Geometry"); 280 280 281 MGeomCamMagic geom; 281 282 MHCamera *display = new MHCamera(geom);
Note:
See TracChangeset
for help on using the changeset viewer.