Changeset 4994

Timestamp:

09/14/04 13:37:28 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhbase/MH.cc (modified) (4 diffs)
• mhcalib/MHCalibrationPix.h (modified) (3 diffs)
• mhcalib/MHGausEvents.cc (modified) (10 diffs)
• mhcalib/MHGausEvents.h (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
      - added readIPR
                 
+
+ 2004/09/14: Markus Gaug
+
+   * mhbase/MH.cc
+     - took out the search for histogram with the same name in 
+       ProjectARray. Always create new histogram whihc has to be 
+       deleted afterwards.
+
+   * mhcalib/MHGausEvents.[h,cc]
+     - put fEventFrequency back from MHCalibraionPix.
+     - always delete fHPowerProbability, if existing. 
+ 
+   * mhcalib/MHCalibrationPix.[h,cc]
+     - take out fEventFrequency
+
 
  2004/09/14: Thomas Bretz

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1181 +1181 @@
     const Int_t size = array.GetSize();
 
-    TH1I *h1=0;
-
-    //check if histogram with identical name exist
-    TObject *h1obj = gROOT->FindObject(name);
-    if (h1obj && h1obj->InheritsFrom("TH1I"))
-    {
-        h1 = (TH1I*)h1obj;
-        h1->Reset();
-    }
-
     Double_t min = size>0 ? array[0] : 0;
     Double_t max = size>0 ? array[0] : 1;
@@ -1203 +1193 @@
     Int_t newbins = 0;
     FindGoodLimits(nbins, newbins, min, max, kFALSE);
-
-    if (!h1)
-    {
-        h1 = new TH1I(name, title, nbins, min, max);
-        h1->SetXTitle("");
-        h1->SetYTitle("Counts");
-        h1->SetDirectory(gROOT);
-    }
+    
+    TH1I *h1 = new TH1I(name, title, nbins, min, max);
+    h1->SetXTitle("");
+    h1->SetYTitle("Counts");
+    h1->SetDirectory(NULL);
 
     // Second loop to fill the histogram
@@ -1226 +1213 @@
 {
     const Int_t size = array.GetSize();
-    TH1I *h1=0;
-
-    //check if histogram with identical name exist
-    TObject *h1obj = gROOT->FindObject(name);
-    if (h1obj && h1obj->InheritsFrom("TH1I"))
-    {
-        h1 = (TH1I*)h1obj;
-        h1->Reset();
-    }
 
     Double_t min = size>0 ? array[0] : 0;
@@ -1249 +1227 @@
     FindGoodLimits(nbins, newbins, min, max, kFALSE);
 
-    if (!h1)
-    {
-        h1 = new TH1I(name, title, newbins, min, max);
-        h1->SetXTitle("");
-        h1->SetYTitle("Counts");
-        h1->SetDirectory(gROOT);
-    }
+    TH1I *h1 = new TH1I(name, title, newbins, min, max);
+    h1->SetXTitle("");
+    h1->SetYTitle("Counts");
+    h1->SetDirectory(NULL);
 
     // Second loop to fill the histogram

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.h

@@ -15 +15 @@
 protected:
 
-  Float_t  fEventFrequency;              // Event frequency in Hertz (to be set)
-
-  Float_t *CreateEventXaxis(Int_t n);    // Create an x-axis for the Event TGraphs
-  Float_t *CreatePSDXaxis  (Int_t n);    // Create an x-axis for the PSD TGraphs
-  
   Float_t  fBlackoutLimit;               // Lower nr sigmas from mean until event is considered blackout
   Int_t    fSaturated;                   // Number of events classified as saturated
@@ -34 +29 @@
   //  TObject *Clone(const char* name="") const;
   
-  void  CreateGraphEvents();          // Create the TGraph fGraphEvents of fEvents                    
-  void  CreateGraphPowerSpectrum();   // Create the TGraph fGraphPowerSpectrum out of fPowerSpectrum
-
   // Getters
   const Double_t GetBlackout       () const;  
-  const Float_t  GetEventFrequency () const { return fEventFrequency; }
   const Double_t GetPickup         () const;
   const Int_t    GetPixId          () const { return fPixId;          }
@@ -51 +42 @@
   void  AddSaturated        ( const Int_t    i                   ) { fSaturated     += i;   }
   void  SetBlackoutLimit    ( const Float_t  lim=fgBlackoutLimit ) { fBlackoutLimit  = lim; }
-  void  SetEventFrequency   ( const Float_t  f                   ) { fEventFrequency = f;   }
   void  SetPickupLimit      ( const Float_t  lim=fgPickupLimit   ) { fPickupLimit    = lim; }
   void  SetPixId            ( const Int_t    i                   ) { fPixId          = i;   }

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

@@ -127 +127 @@
 //
 MHGausEvents::MHGausEvents(const char *name, const char *title)
-    : fHPowerProbability(NULL), 
+    : fEventFrequency(0), 
+      fHPowerProbability(NULL), 
       fPowerSpectrum(NULL),
       fFGausFit(NULL), fFExpFit(NULL),
@@ -173 +174 @@
   // delete histograms
   if (fHPowerProbability)
-    if (gROOT->FindObject(fHPowerProbability->GetName()))
-      delete fHPowerProbability;
+    delete fHPowerProbability;
   
   // delete fits
   if (fFGausFit)
     delete fFGausFit; 
+
   if (fFExpFit)
     delete fFExpFit;
@@ -189 +190 @@
   if (fGraphEvents)
     delete fGraphEvents;
+
   if (fGraphPowerSpectrum)
     delete fGraphPowerSpectrum;
+
 }
       
@@ -199 +202 @@
 // Sets:
 // - all other pointers to NULL
-// - all variables to 0.
+// - all variables to 0. and keep fEventFrequency
 // - all flags to kFALSE
 // 
@@ -223 +226 @@
   if (fHPowerProbability)
     {
-        if (gROOT->FindObject(fHPowerProbability->GetName()))
-            delete fHPowerProbability;
-        fHPowerProbability = NULL;
-    }
-  
+      delete fHPowerProbability;
+      fHPowerProbability = NULL;
+    }
+
   // delete fits
   if (fFGausFit)
@@ -301 +303 @@
   pix.fHGausHist = fHGausHist;
 
+  pix.fEventFrequency       = fEventFrequency;
   pix.fLast      = fLast;
   pix.fMean      = fMean;
@@ -324 +327 @@
   Float_t *xaxis = new Float_t[n];  
 
-  for (Int_t i=0;i<n;i++)
-    xaxis[i] = (Float_t)i;
+  if (fEventFrequency)
+    for (Int_t i=0;i<n;i++)
+      xaxis[i] = (Float_t)i/fEventFrequency;
+  else
+    for (Int_t i=0;i<n;i++)
+      xaxis[i] = (Float_t)i;
   
   return xaxis;
@@ -432 +439 @@
   fGraphEvents = new TGraph(n,CreateEventXaxis(n),fEvents.GetArray());  
   fGraphEvents->SetTitle("Evolution of Events with time");
+  fGraphEvents->GetXaxis()->SetTitle((fEventFrequency) ? "Time [s]" : "Event Nr.");
   fGraphEvents->GetYaxis()->SetTitle(fHGausHist.GetXaxis()->GetTitle());
   fGraphEvents->GetYaxis()->CenterTitle();
@@ -450 +458 @@
   fGraphPowerSpectrum = new TGraph(n,CreatePSDXaxis(n),fPowerSpectrum->GetArray());  
   fGraphPowerSpectrum->SetTitle("Power Spectrum Density");
+  fGraphPowerSpectrum->GetXaxis()->SetTitle((fEventFrequency) ? "Frequency [Hz]" : "Frequency");
   fGraphPowerSpectrum->GetYaxis()->SetTitle("P(f)");
   fGraphPowerSpectrum->GetYaxis()->CenterTitle();
@@ -465 +474 @@
   Float_t *xaxis = new Float_t[n];
 
-  for (Int_t i=0;i<n;i++)
+  if (fEventFrequency)
+    for (Int_t i=0;i<n;i++)
+      xaxis[i] = 0.5*(Float_t)i*fEventFrequency/n;
+  else
+    for (Int_t i=0;i<n;i++)
     xaxis[i] = 0.5*(Float_t)i/n;
   

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h

@@ -27 +27 @@
   const static Float_t  fgProbLimit;            //! Default for fProbLimit            (now set to: 0.001)
   const static Int_t    fgPowerProbabilityBins; //! Default for fPowerProbabilityBins (now set to: 20)
+
+  Float_t *CreateEventXaxis(Int_t n);  // Create an x-axis for the Event TGraphs
+  Float_t *CreatePSDXaxis(Int_t n);    // Create an x-axis for the PSD TGraphs
   
 protected:
+
+  Float_t  fEventFrequency;              // Event frequency in Hertz (to be set)
 
   Int_t    fBinsAfterStripping;        // Bins for the Gauss Histogram after stripping off the zeros at both ends
@@ -60 +65 @@
   Float_t  fProbLimit;                 // Probability limit for judgement if fit is OK 
 
-  virtual Float_t *CreateEventXaxis(Int_t n);  // Create an x-axis for the Event TGraphs
-  virtual Float_t *CreatePSDXaxis(Int_t n);    // Create an x-axis for the PSD TGraphs
-
   void DrawPowerSpectrum(TVirtualPad &pad, Int_t i);  // Draw graph of fPowerSpectrum and fHPowerProbability
 
@@ -93 +95 @@
         MArrayF *GetEvents()                   { return &fEvents;            }  
   const MArrayF *GetEvents()             const { return &fEvents;            }
-        TF1     *GetFExpFit()                  { return fFExpFit;            }
+  const Float_t  GetEventFrequency () const { return fEventFrequency; }
+  TF1     *GetFExpFit()                  { return fFExpFit;            }
   const TF1     *GetFExpFit()            const { return fFExpFit;            } 
         TF1     *GetFGausFit()                 { return fFGausFit;           }
@@ -141 +144 @@
   
   // Setters
+  void  SetEventFrequency   ( const Float_t  f                   ) { fEventFrequency = f;   }
   void  SetExcluded         ( const Bool_t   b=kTRUE             );  
   void  SetExpFitOK         ( const Bool_t   b=kTRUE             );
@@ -157 +161 @@
 
   void CreateFourierSpectrum();                   // Create the fourier spectrum out of fEvents
-  virtual void     CreateGraphEvents();        // Create the TGraph fGraphEvents of fEvents 
-  virtual void     CreateGraphPowerSpectrum(); // Create the TGraph fGraphPowerSpectrum out of fPowerSpectrum
+  void CreateGraphEvents();        // Create the TGraph fGraphEvents of fEvents 
+  void CreateGraphPowerSpectrum(); // Create the TGraph fGraphPowerSpectrum out of fPowerSpectrum
 
   ClassDef(MHGausEvents, 1) // Base class for events with Gaussian distributed values