Changeset 2210 for trunk/MagicSoft/Mars/meventdisp
- Timestamp:
- 06/23/03 13:19:34 (22 years ago)
- Location:
- trunk/MagicSoft/Mars/meventdisp
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc
r2178 r2210 36 36 #include "MEvtLoop.h" // MEvtLoop::GetParList 37 37 #include "MTaskList.h" // MTaskList::AddToList 38 #include "M CamDisplay.h" // MCamDisplay38 #include "MHCamera.h" // MHCamera 39 39 #include "MHillasCalc.h" // MHillasCalc 40 40 #include "MHillasSrcCalc.h" // MHillasSrcCalc 41 41 #include "MPedestalCam.h" // MPedestalCam 42 #include "MCerPhot Calc.h" // MCerPhotCalc42 #include "MCerPhotAnal2.h" // MCerPhotAnal 43 43 #include "MMcPedestalCopy.h" // MMcPedestalCopy 44 44 #include "MMcPedestalNSBAdd.h" // MMcPedestalNSBAdd … … 120 120 MMcPedestalCopy *pcopy = new MMcPedestalCopy; 121 121 MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd; 122 MCerPhot Calc *ncalc = new MCerPhotCalc;122 MCerPhotAnal2 *ncalc = new MCerPhotAnal2; 123 123 MClone *clone = new MClone("MCerPhotEvt"); 124 124 MImgCleanStd *clean = new MImgCleanStd; … … 177 177 { 178 178 fCanvas2[i]->cd(); 179 fDisplay[i] = new M CamDisplay(geom);179 fDisplay[i] = new MHCamera(*geom); 180 180 fDisplay[i]->Draw(); 181 181 fDisplay[i]->AddNotify(*(MCamEvent*)GetParList()->FindObject("MRawEvtData")); … … 249 249 const MPedestalCam *ped = (MPedestalCam*)plist->FindObject("MPedestalCam"); 250 250 251 fDisplay[0]-> Fill((MCamEvent&)*evt, 0);252 fDisplay[1]-> Fill((MCamEvent&)*evt, 1);253 fDisplay[2]-> Fill((MCamEvent&)*evt, 2);251 fDisplay[0]->SetCamContent((MCamEvent&)*evt, 0); 252 fDisplay[1]->SetCamContent((MCamEvent&)*evt, 1); 253 fDisplay[2]->SetCamContent((MCamEvent&)*evt, 2); 254 254 fDisplay[3]->FillLevels(*evt, *clean); 255 fDisplay[4]-> Fill((MCamEvent&)*ped);255 fDisplay[4]->SetCamContent((MCamEvent&)*ped); 256 256 257 257 for (int i=0; i<5; i++) -
trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h
r1966 r2210 9 9 10 10 class MGeomCam; 11 class M CamDisplay;11 class MHCamera; 12 12 13 13 class MGCamDisplay : public MGEvtDisplay … … 19 19 TGListBox *fPixelList; 20 20 21 M CamDisplay*fDisplay[5];21 MHCamera *fDisplay[5]; 22 22 TCanvas *fCanvas2[5]; 23 23 -
trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc
r2205 r2210 46 46 #include "MTaskList.h" 47 47 #include "MEvtLoop.h" 48 #include "M CamDisplay.h"48 #include "MHCamera.h" 49 49 #include "MReadMarsFile.h" 50 50 #include "MGeomCamMagic.h" … … 279 279 AddTab("Geometry"); 280 280 MGeomCamMagic geom; 281 M CamDisplay *display = new MCamDisplay(&geom);281 MHCamera *display = new MHCamera(geom); 282 282 display->Draw(); 283 283 display->DrawPixelNumbers(); … … 648 648 { 649 649 case kTE_ENTER: 650 case kCM_BUTTON:651 650 if (parm1==kClose) 652 651 { … … 664 663 ReadinEvent(); 665 664 return kTRUE; 666 667 case kCM_BUTTON:668 switch (parm1)669 {670 case kEvtPrev:671 ReadinEvent(-1);672 return kTRUE;673 674 case kEvtNext:675 ReadinEvent(+1);676 return kTRUE;677 }678 return kTRUE;679 665 } 680 666 return kTRUE; … … 685 671 switch (GET_SUBMSG(msg)) 686 672 { 673 case kCM_BUTTON: 674 if (parm1==kClose) 675 { 676 CloseWindow(); 677 return kTRUE; 678 } 679 680 if (!fInitOk) 681 return kTRUE; 682 683 switch (parm1) 684 { 685 case kEvtPrev: 686 ReadinEvent(-1); 687 return kTRUE; 688 689 case kEvtNext: 690 ReadinEvent(+1); 691 return kTRUE; 692 } 693 return kTRUE; 694 687 695 case kCM_MENU: 688 696 switch (parm1)
Note:
See TracChangeset
for help on using the changeset viewer.