Changeset 658 for trunk/MagicSoft

Timestamp:

03/01/01 17:22:23 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• meventdisp/MGFadcDisp.cc (modified) (12 diffs)
• meventdisp/MGFadcDisp.h (modified) (1 diff)
• mraw/MRawEvtData.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc

@@ -37 +37 @@
   //   first connect the file with this Object
   
-  plist = new MParList(); 
-
-  runheader = new MRawRunHeader();
-  plist->AddToList(runheader);
-
-  evtheader = new MRawEvtHeader();
-  plist->AddToList(evtheader);
-  evttime   = new MTime();
-  plist->AddToList(evttime);
-  evtdata   = new MRawEvtData();
-  plist->AddToList(evtdata);
-  evtcrate  = new MRawCrateArray();
-  plist->AddToList(evtcrate);
-
-  
-  readin  =  new MReadTree ( filename, treename ) ; 
-  readin->PreProcess( plist ) ; 
+  pList = new MParList();
+
+  fRunHeader = new MRawRunHeader();
+  pList->AddToList(fRunHeader);
+
+  fEvtHeader = new MRawEvtHeader();
+  pList->AddToList(fEvtHeader);
+  fEvtTime   = new MTime();
+  pList->AddToList(fEvtTime);
+  fEvtData   = new MRawEvtData();
+  pList->AddToList(fEvtData);
+  fEvtCrate  = new MRawCrateArray();
+  pList->AddToList(fEvtCrate);
+
+  
+  fReadTree  =  new MReadTree ( filename, treename ) ; 
+  fReadTree->PreProcess( pList ) ; 
 
   //
@@ -92 +92 @@
 
   char wortdummy[100] ; 
-  sprintf (wortdummy, "out of %d Events", readin->GetEntries() ) ; 
+  sprintf (wortdummy, "out of %d Events", fReadTree->GetEntries() ) ; 
   fLabelTotNr = new TGLabel(fTop2, new TGString( wortdummy ) );
   fTop2->AddFrame( fLabelTotNr, new TGLayoutHints (kLHintsLeft, 10, 10, 10, 10)) ; 
@@ -203 +203 @@
 
   //
-  //   readin the first event and update the window
-  //
-
-  readin->GetEvent() ; 
+  //   fReadTree the first event and update the window
+  //
+
+  fReadTree->GetEvent() ; 
   CreatePixelList() ; 
   UpdateEventCounter() ; 
@@ -217 +217 @@
   // close the file 
 
-  readin->PostProcess() ; 
-
-  delete  runheader ; 
-  delete  evtheader ; 
-  delete  evttime   ; 
-  delete  evtdata ; 
-  delete  evtcrate  ; 
-
-  delete  plist ;
-
-  delete  readin ; 
+  fReadTree->PostProcess() ; 
+
+  delete  fRunHeader ; 
+  delete  fEvtHeader ;
+  delete  fEvtTime   ;
+  delete  fEvtData ; 
+  delete  fEvtCrate  ; 
+
+  delete  pList ;
+
+  delete  fReadTree ; 
 
   //   destruct the graphical members  
@@ -285 +285 @@
   Int_t redraw ; 
 
-  MRawEvtPixelIter fPixelIter( evtdata );
+  MRawEvtPixelIter fPixelIter( fEvtData );
   char wortdummy[100] ; 
 
@@ -323 +323 @@
       fCan->cd() ; 
       
-      evtdata->Draw(wortdummy) ; 
+      fEvtData->Draw(wortdummy) ; 
       
       fCan->Modified() ; 
@@ -348 +348 @@
   char wortdummy[256] ; 
     
-  sprintf (wortdummy, "%d", readin->GetEventNum() )  ; 
+  sprintf (wortdummy, "%d", fReadTree->GetEventNum() )  ; 
   
   fTxtEvtNr->SetText(wortdummy) ; 
@@ -362 +362 @@
   //  first check if the new event is in the range of possible events
   
-  if ( (iEvt < 0) || (iEvt>= readin->GetEntries()) ) {
+  if ( iEvt < 0 || iEvt >= fReadTree->GetEntries() ) {
     new TGMsgBox(fClient->GetRoot(), this,
                  "WARNING!",
@@ -371 +371 @@
   }
   else {
-    readin->SetEventNum(iEvt) ; 
-    readin->GetEvent() ; 
+    fReadTree->SetEventNum(iEvt) ; 
+    fReadTree->GetEvent() ; 
     CreatePixelList() ; 
     UpdateEventCounter() ; 
@@ -409 +409 @@
             case M_PREVEVT:
 
-              ReadinEvent(readin->GetEventNum()-1 ) ; 
+              ReadinEvent(fReadTree->GetEventNum()-1 ) ; 
  
               break; 
@@ -415 +415 @@
             case M_NEXTEVT:
               
-              ReadinEvent(readin->GetEventNum()+1 ) ; 
+              ReadinEvent(fReadTree->GetEventNum()+1 ) ; 
 
               break; 
@@ -443 +443 @@
               fCan->cd() ; 
 
-              evtdata->Draw(wortdummy) ; 
+              fEvtData->Draw(wortdummy) ; 
               
               fCan->Modified() ; 

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.h

@@ -57 +57 @@
   //
 
-  MParList       *plist ; 
-  MRawRunHeader  *runheader ;  
-  MRawEvtHeader  *evtheader ; 
-  MTime          *evttime   ; 
-  MRawEvtData    *evtdata    ; 
-  MRawCrateArray *evtcrate  ; 
+  MParList       *pList ;
+  MRawRunHeader  *fRunHeader ;
+  MRawEvtHeader  *fEvtHeader ;
+  MTime          *fEvtTime   ;
+  MRawEvtData    *fEvtData    ;
+  MRawCrateArray *fEvtCrate  ;
 
-  MReadTree *readin ; 
+  MReadTree *fReadTree ;
   
   //

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -301 +301 @@
     // Enhance array by the size which we'll read now
     //
-//    Byte_t *lo = new Byte_t[nlo];
-//    Byte_t *hi = new Byte_t[nhi];
-
     const int npixhi = fHiGainPixId->GetSize();
     const int npixlo = fLoGainPixId->GetSize();
@@ -334 +331 @@
         fin.read(higainsam, nhi);
         higainsam += nhi;
-        //+++fin.read(hi, nhi);
-        //+++fHiGainFadcSamples->AddAt(hi, nsamhi+i*nhi, nhi);
 
         // FIXME: Not implemented in the raw files yet
@@ -343 +338 @@
         fin.read(logainsam, nlo);
         logainsam += nlo;
-        //+++fin.read(lo, nlo);
-        //+++fLoGainFadcSamples->AddAt(lo, nsamlo+i*nlo, nlo);
         //}
     }
-//    delete lo;
-//    delete hi;
-}
-
+}
+