Changeset 665 for trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.cc

Timestamp:

03/02/01 12:09:07 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.cc

@@ -23 +23 @@
     //
 
-    fHistHigh = new TObjArray(577);
-    fHistLow  = new TObjArray(577);
-
     //
     //   set the name and title of this object
@@ -38 +35 @@
     //   connect all the histogram with the container fHist
     //
+    fHistHi = new TObjArray(577);
+    fHistLo = new TObjArray(577);
 
     Char_t  tmp1[40];
     Char_t  tmp2[40];
-    TH1F    *h1;
 
     for ( Int_t i = 0 ; i < 577 ; i++)
@@ -48 +46 @@
         sprintf ( tmp2, "high gain Pixel %d", i ) ;
 
-        h1 = new TH1F ( tmp1, tmp2, 256, 0., 255. ) ;
-
-        fHistHigh->Add( h1 ) ;
+        fHistHi->Add( new TH1F ( tmp1, tmp2, 256, 0., 255. )  ) ;
 
         sprintf ( tmp1, "low %d", i ) ;
         sprintf ( tmp2, "low gain Pixel %d", i ) ;
 
-        h1 = new TH1F ( tmp1, tmp2, 256, 0., 255. ) ;
-
-        fHistLow->Add( h1 ) ;
+        fHistLo->Add( new TH1F ( tmp1, tmp2, 256, 0., 255. ) ) ;
 
     }
@@ -67 +61 @@
   //   default destructor 
   //
-  delete fHistHigh ; 
-  delete fHistLow  ; 
+  delete fHistHi ;
+  delete fHistLo ;
 }
 
@@ -75 +69 @@
   for ( Int_t i = 0 ; i < 576 ; i++)
     {
-      fHistHigh[i].Print() ;
+      fHistHi[i].Print() ;
     }
 }
 
-void MHistosAdc::FillAdcHistHigh ( Int_t iPix, Byte_t data)
+void MHistosAdc::FillAdcHistHi ( Int_t iPix, Byte_t data)
 {
   //
   
-  ((TH1F*) (fHistHigh->At(iPix)))->Fill( (Float_t) data ) ;
+  GetHistHi(iPix)->Fill( (Float_t) data ) ;
 }
 
-void MHistosAdc::FillAdcHistLow ( Int_t iPix, Byte_t data)
+void MHistosAdc::FillAdcHistLo ( Int_t iPix, Byte_t data)
 {
   //
   
-  ((TH1F*) (fHistLow->At(iPix)))->Fill( (Float_t) data ) ;
+  GetHistLo(iPix)->Fill( (Float_t) data ) ;
 }
 
@@ -99 +93 @@
     //
 
+    //
+    // FIXME: Don't open a file and write to this file!
+    // just Fill the current container (or the two histograms
+    // to an open file. The user must choose a file before.
+    //
     TFile out( name, "recreate") ;
 
@@ -105 +104 @@
     //
 
-    fHistLow->Write() ;
-    fHistHigh->Write() ;
+    fHistLo->Write() ;
+    fHistHi->Write() ;
 }