Changeset 6932 for trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

Timestamp:

04/12/05 17:05:49 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhflux/MHAlpha.cc (modified) (12 diffs)

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -57 +57 @@
 #include "MSrcPosCam.h"
 #include "MHillasSrc.h"
-#include "MEnergyEst.h"
 #include "MTime.h"
 #include "MObservatory.h"
@@ -116 +115 @@
     fHEnergy.UseCurrentStyle();
 
-    fHTheta.SetName("Theta");
+    fHTheta.SetName("ExcessTheta");
     fHTheta.SetTitle(" N_{exc} vs. \\Theta ");
     fHTheta.SetXTitle("\\Theta [\\circ]");
@@ -124 +123 @@
 
     // effective on time versus time
-    fHTime.SetName("Time");
+    fHTime.SetName("ExcessTime");
     fHTime.SetTitle(" N_{exc} vs. Time ");
     fHTime.SetXTitle("Time");
@@ -268 +267 @@
     }
     */
-    fEnergy = (MEnergyEst*)pl->FindObject("MEnergyEst");
+    fEnergy = (MParameterD*)pl->FindObject("MEnergyEst", "MParameterD");
     if (!fEnergy)
     { /*
@@ -277 +276 @@
         } */
 
-        *fLog << warn << "MEnergyEst not found... " << flush;
+        *fLog << warn << "MEnergyEst [MParameterD] not found... " << flush;
 
         if (!fHillas)
@@ -286 +285 @@
             *fLog << "ignored." << endl;
 
-        fHEnergy.SetName("Size");
+        fHEnergy.SetName("ExcessSize");
         fHEnergy.SetTitle(" N_{exc} vs. Size ");
         fHEnergy.SetXTitle("Size [\\gamma]");
@@ -292 +291 @@
     else
     {
-        fHEnergy.SetName("Energy");
+        fHEnergy.SetName("ExcessEnergy");
         fHEnergy.SetTitle(" N_{exc} vs. E_{est} ");
         fHEnergy.SetXTitle("E_{est} [GeV]");
@@ -488 +487 @@
         if (fHillas)
             size = fHillas->GetSize();
-        energy = fEnergy   ? fEnergy->GetEnergy() : (fHillas?fHillas->GetSize():1000);
+        energy = fEnergy   ? fEnergy->GetVal() : (fHillas?fHillas->GetSize():1000);
         theta  = fPointPos ? fPointPos->GetZd()   : 0;
     }
@@ -715 +714 @@
         pad->cd(2);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         fHEnergy.Draw();
 
@@ -737 +738 @@
         pad->cd(3);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         fHTime.Draw();
         AppendPad("time");
@@ -746 +749 @@
     {
         pad->cd(4);
+        gPad->SetGridx();
+        gPad->SetGridy();
         gPad->SetBorderMode(0);
         fHTheta.Draw();
@@ -910 +915 @@
         if (type==0)
         {
-            fMap[1] = fMatrix->AddColumn("MEnergyEst.fEnergy");
+            fMap[1] = fMatrix->AddColumn("MEnergyEst.fVal");
             fMap[2] = -1;
         }