Changeset 8746 for trunk/MagicSoft/Mars/mhflux

Timestamp:

09/17/07 16:56:20 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc

@@ -364 +364 @@
         {
             *fLog << err;
-            *fLog << "ERROR - The maximum simulated Monte Carlo energy is not allowed to change (";
+            *fLog << "ERROR - The maximum simulated Monte Carlo energy is not allowed to change ";
             *fLog << "(" << fEnergyMax << " --> " << rh.GetEUppLim() << ")... abort." << endl;
             return kFALSE;
@@ -392 +392 @@
     fEnergyMax = rh.GetEUppLim();
 
-    if (fNewSlope==-99)
-    {
-        *fLog << inf << "A new slope for the power law has not been defined... no weighting applied." << endl;
+    if (fNewSlope==-99 && fFormula.IsNull())
+    {
+        *fLog << inf << "A new slope for the power law has not yet been defined... using " << fOldSlope << "." << endl;
         fNewSlope = fOldSlope;
     }
@@ -400 +400 @@
     if (fFunc)
         delete fFunc;
+
+    if (GetFormulaSpecOld()==GetFormulaSpecNew())
+        *fLog << inf << "No spectral change requested..." << endl;
+    else
+    {
+        *fLog << inf << "Weighting from slope " << fOldSlope << " to ";
+        if (fFormula.IsNull())
+            *fLog << "slope " << fNewSlope << "." << endl;
+        else
+            *fLog << GetFormulaSpecNewX() << endl;
+    }
 
     fFunc = new TF1("", GetFormulaWeightsX());