Changeset 6977 for trunk/MagicSoft/Mars/mhflux

Timestamp:

04/25/05 15:30:46 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MHAlpha.cc (modified) (8 diffs)
• MHAlpha.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -84 +84 @@
     fPointPos(0), fTimeEffOn(0), fTime(0),
     fSkipHistTime(kFALSE), fSkipHistTheta(kFALSE), fSkipHistEnergy(kFALSE),
-    fNumTimeBins(10), fMatrix(0)
+    fForceUsingSize(kFALSE), fNumTimeBins(10), fMatrix(0)
+
 {
     //
@@ -95 +96 @@
     fHAlpha.SetTitle("Alpha");
     fHAlpha.SetXTitle("\\Theta [deg]");
-    fHAlpha.SetYTitle("E_{est} [GeV]");
+    //fHAlpha.SetYTitle("E_{est} [GeV]");
     fHAlpha.SetZTitle("|\\alpha| [\\circ]");
     fHAlpha.SetDirectory(NULL);
@@ -108 +109 @@
 
 
-    //fHEnergy.SetName("Energy");
+    fHEnergy.SetName("Excess");
     //fHEnergy.SetTitle(" N_{exc} vs. E_{est} ");
     //fHEnergy.SetXTitle("E_{est} [GeV]");
@@ -256 +257 @@
 
     fHillas = 0;
-    /*
-    if (fSizeMin>=0 || fSizeMax>=0)
-    {
-        fHillas = (MHillas*)pl->FindObject("MHillas");
-        if (!fHillas)
-        {
-            *fLog << warn << "Size cut set, but MHillas not found... abort." << endl;
-            return kFALSE;
-        }
-    }
-    */
-    fEnergy = (MParameterD*)pl->FindObject("MEnergyEst", "MParameterD");
+    fEnergy = fForceUsingSize ? 0 : (MParameterD*)pl->FindObject("MEnergyEst", "MParameterD");
     if (!fEnergy)
-    { /*
-        if (fEnergyMin>=0 || fEnergyMax>=0)
-        {
-            *fLog << warn << "Energy cut set, but MEnergyEst not found... abort." << endl;
-            return kFALSE;
-        } */
-
+    {
         *fLog << warn << "MEnergyEst [MParameterD] not found... " << flush;
 
@@ -285 +269 @@
             *fLog << "ignored." << endl;
 
-        fHEnergy.SetName("ExcessSize");
         fHEnergy.SetTitle(" N_{exc} vs. Size ");
-        fHEnergy.SetXTitle("Size [\\gamma]");
+        fHEnergy.SetXTitle("Size [phe]");
+        fHAlpha.SetYTitle("Size [phe]");
     }
     else
     {
-        fHEnergy.SetName("ExcessEnergy");
         fHEnergy.SetTitle(" N_{exc} vs. E_{est} ");
         fHEnergy.SetXTitle("E_{est} [GeV]");
+        fHAlpha.SetYTitle("E_{est} [GeV]");
     }
 
@@ -325 +309 @@
     binse.SetEdges(fOffData ? *fOffData : fHAlpha, 'y');
     binsa.SetEdges(fOffData ? *fOffData : fHAlpha, 'z');
-
     if (!fOffData)
     {
@@ -336 +319 @@
             binse.SetEdges(1, 10, 100000);
         else
-            binse.SetEdges(*pl, "BinningEnergyEst");
+            if (fEnergy)
+                binse.SetEdges(*pl, "BinningEnergyEst");
+            else
+                binse.SetEdges(*pl, "BinningSize");
 
         binsa.SetEdges(*pl, "BinningAlpha");
+    }
+    else
+    {
+        fHEnergy.SetTitle(fOffData->GetTitle());
+        fHEnergy.SetXTitle(fOffData->GetYaxis()->GetTitle());
+        fHAlpha.SetYTitle(fOffData->GetYaxis()->GetTitle());
     }
 
@@ -946 +938 @@
         rc = kTRUE;
     }
+    if (IsEnvDefined(env, prefix, "ForceUsingSize", print))
+    {
+        fForceUsingSize = GetEnvValue(env, prefix, "ForceUsingSize", fForceUsingSize);
+        rc = kTRUE;
+    }
     return rc;
 }

trunk/MagicSoft/Mars/mhflux/MHAlpha.h

@@ -106 +106 @@
     Bool_t fSkipHistTheta;
     Bool_t fSkipHistEnergy;
+    Bool_t fForceUsingSize;
 
     UShort_t fNumTimeBins;      // Number of time bins to fill together
@@ -141 +142 @@
     void SetOffData(const MHAlpha &h)
     {
-        fOffData = &h.fHAlpha;
+        fOffData        = &h.fHAlpha;
+        fForceUsingSize =  h.fForceUsingSize;
+        fNumTimeBins    =  h.fNumTimeBins;
     }
     void SetNumTimeBins(UShort_t n) { fNumTimeBins = n; }
@@ -161 +164 @@
     void SkipHistTheta(Bool_t b=kTRUE)  { fSkipHistTheta=b; }
     void SkipHistEnergy(Bool_t b=kTRUE) { fSkipHistEnergy=b; }
+    void ForceUsingSize(Bool_t b=kTRUE) { fForceUsingSize=b; }
 
     void DrawAll(); //*MENU*