Changeset 1652 for trunk/MagicSoft/Mars/mmain

Timestamp:

11/20/02 12:18:01 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MDataCheck.cc (modified) (6 diffs)
• MDataCheck.h (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MDataCheck.cc

@@ -31 +31 @@
 #include "MFillH.h"
 #include "MParList.h"
+#include "MEvtLoop.h"
+#include "MHFadcCam.h"
 #include "MTaskList.h"
-#include "MEvtLoop.h"
 #include "MReadTree.h"
 #include "MGDisplayAdc.h"
@@ -58 +59 @@
 {
     TGTextButton *pedadc = new TGTextButton(fTop1, "ADC Spectra of Pedestals", kButPedAdc);
-    TGTextButton *cradc  = new TGTextButton(fTop1, "ADC Specta of Cosmics",    kButEvtAdc);
-    TGTextButton *pedtdc = new TGTextButton(fTop3, "TDC Spectra of Pedestals", kButPedTdc);
-    TGTextButton *crtdc  = new TGTextButton(fTop3, "TDC Specta of Cosmics",    kButEvtTdc);
+    TGTextButton *cradc  = new TGTextButton(fTop1, "ADC Spectra of Cosmics",    kButEvtAdc);
+    TGTextButton *pedtdc = new TGTextButton(fTop3, "Run Spectra of Pedestals", kButPedTdc);
+    TGTextButton *crtdc  = new TGTextButton(fTop3, "Run Spectra of Cosmics",    kButEvtTdc);
 
     pedadc->Associate(this);
@@ -97 +98 @@
 //  histograms.
 //
-void MDataCheck::ViewAdcSpectra(const char *inputfile, const char *treeName)
+void MDataCheck::View(const char *inputfile, const char *treeName, MHFadcPix::Type_t t)
 {
     //
@@ -119 +120 @@
     read.DisableAutoScheme();
 
-    MFillH fill("MHFadcCam", "MRawEvtData");
+    MHFadcCam hist(t);
+    plist.AddToList(&hist);
+
+    MFillH fill(&hist, "MRawEvtData");
 
     tasks.AddToList(&read);
@@ -149 +153 @@
         return;
 
-    new MGDisplayAdc((MHFadcCam*)plist.FindObject("MHFadcCam"));
+    new MGDisplayAdc(&hist);
 }
 
@@ -178 +182 @@
         {
         case kButPedAdc:
-            ViewAdcSpectra(fInputFile, "PedEvents");
+            View(fInputFile, "PedEvents", MHFadcPix::kValue);
             return kTRUE;
 
         case kButEvtAdc:
-            ViewAdcSpectra(fInputFile, "Events");
+            View(fInputFile, "Events", MHFadcPix::kValue);
             return kTRUE;
 
         case kButPedTdc:
-            // fOctober.PedTdcSpectra(fInputFile) ;
+            View(fInputFile, "PedEvents", MHFadcPix::kSlices);
             return kTRUE;
 
         case kButEvtTdc:
+            View(fInputFile, "Events", MHFadcPix::kSlices);
             return kTRUE;
         }

trunk/MagicSoft/Mars/mmain/MDataCheck.h

@@ -6 +6 @@
 #endif
 
+#ifndef MARS_MHFadcPix
+#include "MHFadcPix.h"
+#endif
+
 class MDataCheck : public MBrowser
 {
 private:
-    void ViewAdcSpectra(const char *inputfile, const char *treeName);
+    void View(const char *inputfile, const char *treeName, MHFadcPix::Type_t t);
 
 public: