Changeset 7169 for trunk/MagicSoft/Mars/mhflux

Timestamp:

06/17/05 13:33:56 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MAlphaFitter.cc (modified) (3 diffs)
• MAlphaFitter.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -624 +624 @@
         rc = kTRUE;
     }
-
+    if (IsEnvDefined(env, prefix, "Scale", print))
+    {
+        fScaleUser = GetEnvValue(env, prefix, "Scale", fScaleUser);
+        rc = kTRUE;
+    }
     if (IsEnvDefined(env, prefix, "ScaleMode", print))
     {
@@ -644 +648 @@
         if (txt==(TString)"userscale")
             fScaleMode = kUserScale;
-        rc = kTRUE;
-    }
-    if (IsEnvDefined(env, prefix, "Signalfunction", print))
+        if (txt==(TString)"fixed")
+        {
+            fScaleMode = kUserScale;
+            fScaleUser = fScaleFactor;
+            cout << "---------> " << fScaleFactor << " <----------" << endl;
+        }
+        rc = kTRUE;
+    }
+    if (IsEnvDefined(env, prefix, "SignalFunction", print))
     {
         TString txt = GetEnvValue(env, prefix, "SignalFunction", "");
@@ -657 +667 @@
         rc = kTRUE;
     }
-    if (IsEnvDefined(env, prefix, "Scale", print))
-    {
-        fScaleUser = GetEnvValue(env, prefix, "Scale", fScaleUser);
-        rc = kTRUE;
-    }
-
-    return rc;
-}
+
+    return rc;
+}

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -51 +51 @@
     Int_t   fPolynomOrder;      // order of polyom to be fitted to the background
     Bool_t  fFitBackground;     // Backround fit: yes/no
-    SignalFunc_t fSignalFunc;  // Type of signal function
+    SignalFunc_t fSignalFunc;   // Type of signal function
     // Result
     Double_t fSignificance;     // significance of signal
@@ -61 +61 @@
     Double_t fChiSqBg;          // Reduced (chi^2/NDF) chisq of bg fit
     Double_t fIntegralMax;      // Calculated bin border to which it was integrated
-    Double_t fScaleFactor;      // Scale factor for off-data
+    Double_t fScaleFactor;      // Scale factor determined for off-data
 
     TArrayD fCoefficients;      // Fit result