Changeset 667 for trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.cc

Timestamp:

03/02/01 13:43:09 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mdatacheck/MViewAdcSpectra.cc

@@ -26 +26 @@
 MViewAdcSpectra::~MViewAdcSpectra() 
 {
-  // default destructor  
+    // default destructor
+    delete fHistosAdc;
 } 
 
@@ -44 +45 @@
   // connect them in the required way. 
  
-  MParList *plist  = new MParList;
-  MTaskList *tasks = new MTaskList;
-  plist->AddToList(tasks);
+  //
+  //   create the data containers for the raw data
+  //
+  MParList plist;
+  
+  MRawRunHeader runheader;
+  plist.AddToList(&runheader);
 
-  //   create the data containers for the raw data 
+  MRawEvtHeader evtheader;
+  plist.AddToList(&evtheader);
   
-  MRawRunHeader *runheader = new MRawRunHeader;
-  plist->AddToList(runheader);
+  MRawEvtData evtdata;
+  plist.AddToList(&evtdata);
+  
+  MRawCrateArray cratearray;
+  plist.AddToList(&cratearray);
+  
+  MTime evttime("MTime");
+  plist.AddToList(&evttime);
 
-  MRawEvtHeader *evtheader = new MRawEvtHeader;
-  plist->AddToList(evtheader);
-  
-  MRawEvtData *evtdata = new MRawEvtData;
-  plist->AddToList(evtdata);
-  
-  MRawCrateArray *cratearray = new MRawCrateArray;
-  plist->AddToList(cratearray);
-  
-  MTime *evttime = new MTime("MTime");
-  plist->AddToList(evttime);
+  fHistosAdc= new MHistosAdc;
+  plist.AddToList( fHistosAdc ) ;
 
-  MHistosAdc *histosAdc = new MHistosAdc() ; 
-  plist->AddToList( histosAdc ) ; 
-  
+  //
   //    set up the tasks for this job
+  //
+  MTaskList tasks;
+  plist.AddToList(&tasks);
 
-  MReadTree *readin  =  new MReadTree ( inputfile, treeName ) ; 
-  tasks->AddToList( readin ) ; 
+  MReadTree readin ( inputfile, treeName ) ;
+  tasks.AddToList( &readin ) ;
 
   //  MDumpEvtHeader *dumpheader = new MDumpEvtHeader() ; 
   //  tasks->AddToList( dumpheader ) ; 
  
-  MFillAdcSpect *fillspect = new MFillAdcSpect() ; 
-  tasks->AddToList( fillspect ) ; 
+  MFillAdcSpect fillspect;
+  tasks.AddToList( &fillspect ) ;
 
-  MShowSpect *showspect = new MShowSpect( "MHistosAdc" ) ; 
-  tasks->AddToList( showspect ) ;
+  MShowSpect showspect( "MHistosAdc" ) ;
+  tasks.AddToList( &showspect ) ;
 
   //    set up the loop for the processing 
   
   MEvtLoop magic;
-  magic.SetParList(plist);
+  magic.SetParList(&plist);
 
   //    start the loop running 
@@ -91 +95 @@
   magic.Eventloop() ; 
   
-
-  cout << " End of this job " << endl ; 
-
-  return kTRUE ; 
+  return kTRUE ;
 
 }