Changeset 4994 for trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc (modified) (10 diffs)

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;