Changeset 667 for trunk/MagicSoft/Mars
- Timestamp:
- 03/02/01 13:43:09 (24 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r666 r667 2 2 2000/03/02: Thomas Bretz 3 3 4 4 5 * manalysis/Makefile, mdatacheck/Makefile, meventdisp/Makefile, 5 6 mgui/Makefile: … … 7 8 8 9 * mbase/MParList.[cc,h]: 9 Added FindCreateObj member function 10 Added FindCreateObj member function, added a name to the constructor 10 11 11 12 * mbase/MReadTree.cc: … … 14 15 * mdatacheck/MDumpEvtHeader.cc: 15 16 removed fPixelIter from member list, changed cout to *fLog 17 18 * mdatacheck/MViewAdcSpectra.cc: 19 removed a HUGE memory leak. All the objects in the list (and the 20 lists itself were NEVER deleted) 16 21 17 22 * mdatacheck/MFillAdcSpect.cc … … 20 25 21 26 * mdatacheck/MShowSpect.cc 22 changed cout to *fLog 27 changed cout to *fLog, added a name to the constructor 23 28 24 29 * mraw/MRawFileRead.cc: … … 26 31 27 32 * mdatacheck/MGDisplayAdc.[h,cc]: 28 added some new member functions to make code more clear 33 added some new member functions to make code more clear, 34 removed fHists from the destructor 29 35 30 36 * mdatacheck/MHistosAdc.h: -
trunk/MagicSoft/Mars/mbase/MParList.cc
r666 r667 24 24 ClassImp(MParList) 25 25 26 MParList::MParList( )26 MParList::MParList(const char *name, const char *title) 27 27 { 28 // 29 // default constructor 30 // creates an empty list 31 // 32 28 // 29 // default constructor 30 // creates an empty list 31 // 32 *fName = name ? name : "MParList"; 33 *fTitle = title ? title : "List of Parameter Containers"; 33 34 } 34 35 35 36 MParList::MParList(MParList &ts) 36 37 { 37 //38 // copy constructor39 //38 // 39 // copy constructor 40 // 40 41 41 fContainer.AddAll(&ts.fContainer);42 fContainer.AddAll(&ts.fContainer); 42 43 } 43 44 -
trunk/MagicSoft/Mars/mbase/MParList.h
r666 r667 29 29 30 30 public: 31 MParList( );31 MParList(const char *name=NULL, const char *title=NULL); 32 32 MParList(MParList &ts); 33 33 -
trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc
r665 r667 23 23 } ; 24 24 25 MGDisplayAdc::MGDisplayAdc ( MHistosAdc * Histos,25 MGDisplayAdc::MGDisplayAdc ( MHistosAdc *histos, 26 26 const TGWindow *p, const TGWindow *main, 27 27 UInt_t w, UInt_t h, … … 29 29 : TGTransientFrame(p, main, w, h, options ) 30 30 { 31 // default constructor 32 // 33 fHists = Histos ; 31 // 32 // default constructor 33 // 34 35 // 36 // NEVER try to delete them in the destructor! 37 // 38 fHists = histos ; 39 40 // 41 // the top frame for the list and some buttons and the Canvas 42 // 43 fFrameTop = new TGHorizontalFrame (this, 60,20, kFitWidth ) ; 44 45 // 46 // left part of top frame 47 // 48 fFT1 = new TGVerticalFrame (fFrameTop, 80,300, kFitWidth ) ; 49 50 fHistoList = new TGListBox ( fFT1, M_LIST_HISTO ) ; 51 fHistoList->Associate( this ) ; 52 fFT1->AddFrame ( fHistoList, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 10 ) ) ; 34 53 35 // the top frame for the list and some buttons and the Canvas 54 fHistoList->Resize(80, 405 ) ; 55 56 fFrameTop->AddFrame (fFT1, new TGLayoutHints ( kLHintsTop , 10, 10, 10, 10 ) ) ; 57 58 // 59 // middle part of top frame 60 // 61 fFT2 = new TGVerticalFrame (fFrameTop, 80,20, kFitWidth ) ; 62 63 fButtonPrev = new TGTextButton ( fFT2, "Prev Histo", M_BUTTON_PREV ) ; 64 fButtonPrev->Associate (this) ; 65 fFT2->AddFrame ( fButtonPrev, new TGLayoutHints (kLHintsLeft | kLHintsTop,10, 10, 0, 10 ) ) ; 66 67 68 fVslider1 = new TGVSlider (fFT2, 250, kSlider1 | kScaleBoth, M_VSId1); 69 70 fVslider1->Associate(this); 71 fVslider1->SetRange(0, 576); 72 fFT2->AddFrame(fVslider1); 73 74 fButtonNext = new TGTextButton ( fFT2, "Next Histo", M_BUTTON_NEXT ) ; 75 fButtonNext->Associate (this) ; 76 fFT2->AddFrame ( fButtonNext, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 5 ) ) ; 77 78 fFrameTop->AddFrame (fFT2, new TGLayoutHints ( kLHintsTop , 10, 10, 10, 10 ) ) ; 79 80 // 81 // Radio buttons, used to select the high, low anh high/low display 82 // 83 fRadio[0] = new TGRadioButton(fFT2, "&High Gain", M_RADIO_HIGH); 84 fFT2->AddFrame ( fRadio[0], new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 5 ) ) ; 85 fRadio[0]->Associate(this); 86 fRadio[0]->SetState(kButtonDown); 87 fHistoLock = kFALSE; 88 fHistoType=1; 89 90 fRadio[1] = new TGRadioButton(fFT2, "&Low Gain", M_RADIO_LOW); 91 fFT2->AddFrame ( fRadio[1], new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 5 ) ) ; 92 fRadio[1]->Associate(this); 93 94 fRadio[2] = new TGRadioButton(fFT2, "H&igh/Low Gain", M_RADIO_LH); 95 fFT2->AddFrame ( fRadio[2], new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 5 ) ) ; 96 fRadio[2]->Associate(this); 97 98 // 99 // right part of top frame 100 // 101 fFT3 = new TGVerticalFrame (fFrameTop, 60, 60, kFitWidth ) ; 102 103 fECanv = new TRootEmbeddedCanvas("fECanv", fFT3, 400, 400 ) ; 104 105 fFT3->AddFrame( fECanv, new TGLayoutHints ( kLHintsCenterX | kLHintsCenterY | kLHintsExpandX | kLHintsExpandY , 10, 10, 10, 10 ) ) ; 106 107 // 108 //the button for reseting the histogram 109 // 110 fButtonReset = new TGTextButton ( fFT3, "Reset histo", M_BUTTON_RESET ) ; 111 fButtonReset->Associate (this) ; 112 fFT3->AddFrame ( fButtonReset, new TGLayoutHints (kLHintsCenterX | kLHintsTop,10, 10, 0, 10 ) ) ; 113 114 fCanv = fECanv->GetCanvas() ; 115 116 fFrameTop->AddFrame (fFT3, new TGLayoutHints ( kLHintsCenterX | kLHintsCenterY | kLHintsExpandX | kLHintsExpandY , 10, 10, 10, 10 ) ) ; 117 118 AddFrame ( fFrameTop, new TGLayoutHints ( kLHintsTop | kLHintsExpandX , 10, 10, 10, 10 ) ) ; 119 120 // 121 // the low frame for the control buttons 122 // 123 fFrameLow = new TGHorizontalFrame (this, 60,20, kFixedWidth ) ; 124 125 fButtonSave = new TGTextButton ( fFrameLow, "Save", M_BUTTON_SAVE ) ; 126 fButtonSave->Associate (this) ; 127 fFrameLow->AddFrame ( fButtonSave, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 5, 5 ) ) ; 128 129 fButtonPrint = new TGTextButton ( fFrameLow, "Print", M_BUTTON_PRINT ) ; 130 fButtonPrint->Associate (this) ; 131 fFrameLow->AddFrame ( fButtonPrint, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 5, 5 ) ) ; 132 133 fButtonPrintAll = new TGTextButton ( fFrameLow, "PrintAll", M_BUTTON_PRINTALL ) ; 134 fButtonPrintAll->Associate (this) ; 135 fFrameLow->AddFrame ( fButtonPrintAll, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 5, 5 ) ) ; 36 136 37 fFrameTop = new TGHorizontalFrame (this, 60,20, kFitWidth ) ; 38 39 40 // left part of top frame 41 fFT1 = new TGVerticalFrame (fFrameTop, 80,300, kFitWidth ) ; 42 43 fHistoList = new TGListBox ( fFT1, M_LIST_HISTO ) ; 44 fHistoList->Associate( this ) ; 45 fFT1->AddFrame ( fHistoList, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 10 ) ) ; 137 fButtonClose = new TGTextButton ( fFrameLow, "Close", M_BUTTON_CLOSE ) ; 138 fButtonClose->Associate (this) ; 139 fFrameLow->AddFrame ( fButtonClose, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 5, 5 ) ) ; 140 AddFrame ( fFrameLow, new TGLayoutHints ( kLHintsBottom | kLHintsExpandX , 10, 10, 10, 10 ) ) ; 46 141 47 fHistoList->Resize(80, 405 ) ; 48 49 50 fFrameTop->AddFrame (fFT1, new TGLayoutHints ( kLHintsTop , 10, 10, 10, 10 ) ) ; 51 52 // middle part of top frame 53 // 54 55 fFT2 = new TGVerticalFrame (fFrameTop, 80,20, kFitWidth ) ; 56 57 fButtonPrev = new TGTextButton ( fFT2, "Prev Histo", M_BUTTON_PREV ) ; 58 fButtonPrev->Associate (this) ; 59 fFT2->AddFrame ( fButtonPrev, new TGLayoutHints (kLHintsLeft | kLHintsTop,10, 10, 0, 10 ) ) ; 60 61 62 fVslider1 = new TGVSlider (fFT2, 250, kSlider1 | kScaleBoth, M_VSId1); 63 64 fVslider1->Associate(this); 65 fVslider1->SetRange(0, 576); 66 fFT2->AddFrame(fVslider1); 67 68 fButtonNext = new TGTextButton ( fFT2, "Next Histo", M_BUTTON_NEXT ) ; 69 fButtonNext->Associate (this) ; 70 fFT2->AddFrame ( fButtonNext, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 5 ) ) ; 71 72 fFrameTop->AddFrame (fFT2, new TGLayoutHints ( kLHintsTop , 10, 10, 10, 10 ) ) ; 73 74 75 76 // Radio buttons, used to select the high, low anh high/low display 77 78 fRadio[0] = new TGRadioButton(fFT2, "&High Gain", M_RADIO_HIGH); 79 fFT2->AddFrame ( fRadio[0], new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 5 ) ) ; 80 fRadio[0]->Associate(this); 81 fRadio[0]->SetState(kButtonDown); 82 fHistoLock = kFALSE; 83 fHistoType=1; 84 85 fRadio[1] = new TGRadioButton(fFT2, "&Low Gain", M_RADIO_LOW); 86 fFT2->AddFrame ( fRadio[1], new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 5 ) ) ; 87 fRadio[1]->Associate(this); 88 89 fRadio[2] = new TGRadioButton(fFT2, "H&igh/Low Gain", M_RADIO_LH); 90 fFT2->AddFrame ( fRadio[2], new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 10, 5 ) ) ; 91 fRadio[2]->Associate(this); 92 93 94 95 // right part of top frame 96 // 97 fFT3 = new TGVerticalFrame (fFrameTop, 60, 60, kFitWidth ) ; 98 142 // 143 // 144 // 145 BuildHistoList() ; 146 147 MapSubwindows(); 148 149 Layout(); 150 151 SetWindowName("ADC Spectra"); 152 SetIconName("ADC Spectra"); 153 154 // 155 // Here the initial display is set to hitogram 0 156 // 157 fHistoList->Select(1, kTRUE); 158 DrawSelectedHi() ; 159 SetSelectedTopEntry(); 160 fCanv->Modified() ; 161 fCanv->Update() ; 162 SetSelectedPos(); 163 164 MapWindow(); 165 SetWMSizeHints(550, 550, 1000, 1000, 1, 1); 166 } 167 168 MGDisplayAdc::~MGDisplayAdc () 169 { 170 delete fButtonSave ; 171 delete fButtonPrint ; 172 delete fButtonPrintAll ; 173 delete fButtonClose ; 99 174 100 101 fECanv = new TRootEmbeddedCanvas("fECanv", fFT3, 400, 400 ) ; 102 103 fFT3->AddFrame( fECanv, new TGLayoutHints ( kLHintsCenterX | kLHintsCenterY | kLHintsExpandX | kLHintsExpandY , 10, 10, 10, 10 ) ) ; 104 105 106 //the button for reseting the histogram 107 fButtonReset = new TGTextButton ( fFT3, "Reset histo", M_BUTTON_RESET ) ; 108 fButtonReset->Associate (this) ; 109 fFT3->AddFrame ( fButtonReset, new TGLayoutHints (kLHintsCenterX | kLHintsTop,10, 10, 0, 10 ) ) ; 110 // 111 112 113 114 fCanv = fECanv->GetCanvas() ; 115 116 fFrameTop->AddFrame (fFT3, new TGLayoutHints ( kLHintsCenterX | kLHintsCenterY | kLHintsExpandX | kLHintsExpandY , 10, 10, 10, 10 ) ) ; 117 118 AddFrame ( fFrameTop, new TGLayoutHints ( kLHintsTop | kLHintsExpandX , 10, 10, 10, 10 ) ) ; 119 120 121 // fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; 122 // 123 // the low frame for the control buttons 124 // 125 fFrameLow = new TGHorizontalFrame (this, 60,20, kFixedWidth ) ; 126 127 fButtonSave = new TGTextButton ( fFrameLow, "Save", M_BUTTON_SAVE ) ; 128 fButtonSave->Associate (this) ; 129 fFrameLow->AddFrame ( fButtonSave, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 5, 5 ) ) ; 130 131 fButtonPrint = new TGTextButton ( fFrameLow, "Print", M_BUTTON_PRINT ) ; 132 fButtonPrint->Associate (this) ; 133 fFrameLow->AddFrame ( fButtonPrint, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 5, 5 ) ) ; 134 135 fButtonPrintAll = new TGTextButton ( fFrameLow, "PrintAll", M_BUTTON_PRINTALL ) ; 136 fButtonPrintAll->Associate (this) ; 137 fFrameLow->AddFrame ( fButtonPrintAll, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 5, 5 ) ) ; 138 139 140 141 fButtonClose = new TGTextButton ( fFrameLow, "Close", M_BUTTON_CLOSE ) ; 142 fButtonClose->Associate (this) ; 143 fFrameLow->AddFrame ( fButtonClose, new TGLayoutHints (kLHintsLeft | kLHintsTop, 10, 10, 5, 5 ) ) ; 144 AddFrame ( fFrameLow, new TGLayoutHints ( kLHintsBottom | kLHintsExpandX , 10, 10, 10, 10 ) ) ; 145 146 // 147 // 148 // 149 BuildHistoList() ; 150 151 MapSubwindows(); 152 153 Layout(); 154 155 SetWindowName("ADC Spectra"); 156 SetIconName("ADC Spectra"); 157 158 //Here the initial display is set to hitogram 0 159 160 fHistoList->Select(1, kTRUE); 161 DrawSelectedHi() ; 162 SetSelectedTopEntry(); 163 fCanv->Modified() ; 164 fCanv->Update() ; 165 SetSelectedPos(); 166 167 MapWindow(); 168 SetWMSizeHints(550, 550, 1000, 1000, 1, 1); 169 170 } 171 172 // ====================================================================== 173 // ====================================================================== 174 // 175 // 176 177 MGDisplayAdc::~MGDisplayAdc () 178 { 179 180 181 delete fButtonSave ; 182 delete fButtonPrint ; 183 delete fButtonPrintAll ; 184 delete fButtonClose ; 185 186 delete fButtonPrev; 187 delete fButtonNext ; 188 delete fButtonReset ; 189 190 delete fVslider1; 191 delete fECanv ; 192 193 194 delete fHists; 195 delete fHistoList ; 196 delete fRadio[2]; 197 delete fRadio[1]; 198 delete fRadio[0]; 199 delete fFT1 ; 200 delete fFT2 ; 201 delete fFT3 ; 202 delete fFrameLow ; 203 delete fFrameTop ; 175 delete fButtonPrev; 176 delete fButtonNext ; 177 delete fButtonReset ; 178 179 delete fVslider1; 180 delete fECanv ; 181 182 delete fHistoList ; 183 delete fRadio[2]; 184 delete fRadio[1]; 185 delete fRadio[0]; 186 delete fFT1 ; 187 delete fFT2 ; 188 delete fFT3 ; 189 delete fFrameLow ; 190 delete fFrameTop ; 204 191 } 205 192 … … 297 284 // 298 285 case M_BUTTON_PREV: 299 if (GetSelected()-1 != 0) 286 case M_BUTTON_NEXT: 287 if ((parm1==M_BUTTON_PREV && GetSelected()-1 > 0) || 288 (parm2==M_BUTTON_NEXT && GetSelected()-1 < 576)) 300 289 { 301 290 if (fHistoLock == kTRUE ) … … 312 301 SelectSelected(); 313 302 DrawSelectedHi() ; 314 }315 316 SetSelectedTopEntry();317 fCanv->Modified() ;318 fCanv->Update() ;319 SetSelectedPos();320 }321 if (fRadio[1]->GetState() != kButtonDown)322 break;323 324 fRadio[0]->SetState(kButtonDown);325 fRadio[1]->SetState(kButtonUp);326 327 break;328 329 //The same as above, but for next histogram330 case M_BUTTON_NEXT:331 if (GetSelected()-1 != 576)332 {333 if (fHistoLock == kTRUE )334 {335 fCanvas->cd(1);336 SelectSelected();337 DrawSelectedHi() ;338 fCanvas->cd(2);339 DrawSelectedLo() ;340 }341 else342 {343 fCanv->cd();344 SelectSelected();345 DrawSelectedHi() ;346 303 347 304 } … … 357 314 fRadio[0]->SetState(kButtonDown); 358 315 fRadio[1]->SetState(kButtonUp); 359 360 316 break; 361 317 … … 370 326 { 371 327 case M_RADIO_HIGH: 372 fRadio[1]->SetState(kButtonUp); 373 fRadio[2]->SetState(kButtonUp); 328 case M_RADIO_LOW: 329 if (parm1 == M_RADIO_HIGH) 330 { 331 fRadio[1]->SetState(kButtonUp); 332 fRadio[2]->SetState(kButtonUp); 333 fHistoType=1; 334 } 335 else 336 { 337 fRadio[0]->SetState(kButtonUp); 338 fRadio[2]->SetState(kButtonUp); 339 fHistoType = 2; 340 } 374 341 fHistoLock = kFALSE; 375 fHistoType=1; 342 376 343 fCanv->cd(); 377 344 SelectSelected(); 378 DrawSelectedHi() ; 345 parm1 == M_RADIO_HIGH ? DrawSelectedHi() : DrawSelectedLo(); 346 379 347 SetSelectedTopEntry(); 380 348 fCanv->Modified() ; … … 383 351 break; 384 352 385 case M_RADIO_LOW:386 fRadio[0]->SetState(kButtonUp);387 fRadio[2]->SetState(kButtonUp);388 fCanv->cd();389 fHistoLock = kFALSE;390 fHistoType = 2;391 392 SelectSelected();393 DrawSelectedLo() ;394 SetSelectedTopEntry();395 396 fCanv->Modified() ;397 fCanv->Update() ;398 SetSelectedPos();399 break;400 401 353 case M_RADIO_LH: 402 354 fRadio[0]->SetState(kButtonUp); -
trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.cc
r665 r667 52 52 53 53 fHistLo->Add( new TH1F ( tmp1, tmp2, 256, 0., 255. ) ) ; 54 55 54 } 56 55 } -
trunk/MagicSoft/Mars/mdatacheck/MShowSpect.cc
r666 r667 16 16 ClassImp(MShowSpect) 17 17 18 MShowSpect::MShowSpect(char *nameHist ) 19 { 20 // default constructor 18 MShowSpect::MShowSpect(const char *nameHist, const char *name, const char *title) 19 { 20 // 21 // default constructor 22 // 21 23 22 sprintf (fHistName, "%s", nameHist ) ; 24 *fName = name ? name : ClassName(); 25 *fTitle = title ? title : "Task to ??? (Harald?)"; 26 27 strcpy( fHistName, nameHist ) ; 23 28 } 24 29 … … 53 58 } 54 59 55 56 57 58 59 60 61 62 63 -
trunk/MagicSoft/Mars/mdatacheck/MShowSpect.h
r466 r667 17 17 { 18 18 private: 19 char fHistName[256] ;19 char fHistName[256] ; 20 20 21 MHistosAdc *fHists; // Pointer to Container with the histograms21 MHistosAdc *fHists; // Pointer to Container with the histograms 22 22 23 23 public: 24 24 25 MShowSpect(char* histName ); 25 MShowSpect(const char* histName, 26 const char *name=NULL, const char *title=NULL); 26 27 27 Bool_t PreProcess(MParList * pList);28 Bool_t PostProcess();29 30 ClassDef(MShowSpect, 1) // Fill the raw ADC in the histograms28 Bool_t PreProcess(MParList * pList); 29 Bool_t PostProcess(); 30 31 ClassDef(MShowSpect, 1) // Fill the raw ADC in the histograms 31 32 }; 32 33 -
trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.cc
r544 r667 26 26 MViewAdcSpectra::~MViewAdcSpectra() 27 27 { 28 // default destructor 28 // default destructor 29 delete fHistosAdc; 29 30 } 30 31 … … 44 45 // connect them in the required way. 45 46 46 MParList *plist = new MParList; 47 MTaskList *tasks = new MTaskList; 48 plist->AddToList(tasks); 47 // 48 // create the data containers for the raw data 49 // 50 MParList plist; 51 52 MRawRunHeader runheader; 53 plist.AddToList(&runheader); 49 54 50 // create the data containers for the raw data 55 MRawEvtHeader evtheader; 56 plist.AddToList(&evtheader); 51 57 52 MRawRunHeader *runheader = new MRawRunHeader; 53 plist->AddToList(runheader); 58 MRawEvtData evtdata; 59 plist.AddToList(&evtdata); 60 61 MRawCrateArray cratearray; 62 plist.AddToList(&cratearray); 63 64 MTime evttime("MTime"); 65 plist.AddToList(&evttime); 54 66 55 MRawEvtHeader *evtheader = new MRawEvtHeader; 56 plist->AddToList(evtheader); 57 58 MRawEvtData *evtdata = new MRawEvtData; 59 plist->AddToList(evtdata); 60 61 MRawCrateArray *cratearray = new MRawCrateArray; 62 plist->AddToList(cratearray); 63 64 MTime *evttime = new MTime("MTime"); 65 plist->AddToList(evttime); 67 fHistosAdc= new MHistosAdc; 68 plist.AddToList( fHistosAdc ) ; 66 69 67 MHistosAdc *histosAdc = new MHistosAdc() ; 68 plist->AddToList( histosAdc ) ; 69 70 // 70 71 // set up the tasks for this job 72 // 73 MTaskList tasks; 74 plist.AddToList(&tasks); 71 75 72 MReadTree *readin = new MReadTree ( inputfile, treeName ) ;73 tasks ->AddToList( readin ) ;76 MReadTree readin ( inputfile, treeName ) ; 77 tasks.AddToList( &readin ) ; 74 78 75 79 // MDumpEvtHeader *dumpheader = new MDumpEvtHeader() ; 76 80 // tasks->AddToList( dumpheader ) ; 77 81 78 MFillAdcSpect *fillspect = new MFillAdcSpect() ;79 tasks ->AddToList( fillspect ) ;82 MFillAdcSpect fillspect; 83 tasks.AddToList( &fillspect ) ; 80 84 81 MShowSpect *showspect = new MShowSpect( "MHistosAdc" ) ;82 tasks ->AddToList(showspect ) ;85 MShowSpect showspect( "MHistosAdc" ) ; 86 tasks.AddToList( &showspect ) ; 83 87 84 88 // set up the loop for the processing 85 89 86 90 MEvtLoop magic; 87 magic.SetParList( plist);91 magic.SetParList(&plist); 88 92 89 93 // start the loop running … … 91 95 magic.Eventloop() ; 92 96 93 94 cout << " End of this job " << endl ; 95 96 return kTRUE ; 97 return kTRUE ; 97 98 98 99 } -
trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.h
r544 r667 6 6 #endif 7 7 8 class MHistosAdc; 9 8 10 class MViewAdcSpectra { 9 11 10 12 private: 11 13 14 MHistosAdc *fHistosAdc; 15 12 16 public: 13 17 14 MViewAdcSpectra() ;18 MViewAdcSpectra() ; 15 19 16 ~MViewAdcSpectra() ;20 ~MViewAdcSpectra() ; 17 21 18 Bool_t AdcSpectra( Char_t *inputFile , Char_t *treeName ) ;22 Bool_t AdcSpectra( Char_t *inputFile , Char_t *treeName ) ; 19 23 20 24 // Bool_t CrAdcSpectra ( Char_t *inputFile ) ;
Note:
See TracChangeset
for help on using the changeset viewer.