Changeset 6965 for trunk/MagicSoft

Timestamp:

04/20/05 15:20:03 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (2 diffs)
• mjobs/MJOptimize.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
      - use the sequence number'd directories in case of calibrated data
        and image files instead of the date.
+
+   * mhflux/MAlphaFitter.cc:
+     - copy also results in Copy()
+
+   * mjobs/MJOptimize.cc:
+     - print result of optimization in case MAlphaFitter is used
+     - store results back in initial MAlphaFitter
 
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -306 +306 @@
     MAlphaFitter &f = static_cast<MAlphaFitter&>(o);
 
+    // Setup
     f.fSigInt       = fSigInt;
     f.fSigMax       = fSigMax;
@@ -319 +320 @@
     f.fCoefficients.Reset();
 
+    // Result
+    f.fSignificance     = fSignificance;
+    f.fEventsExcess     = fEventsExcess;
+    f.fEventsSignal     = fEventsSignal;
+    f.fEventsBackground = fEventsBackground;
+    f.fChiSqSignal      = fChiSqSignal;
+    f.fChiSqBg          = fChiSqBg;
+    f.fIntegralMax      = fIntegralMax;
+    f.fScaleFactor      = fScaleFactor;
+
+    // Function
     TF1 *fcn = f.fFunc;
     f.fFunc = new TF1(*fFunc);

trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

@@ -866 +866 @@
     tasklist.AddToList(&fill);
 
+    // Optimize with the tasklist in this parameterlist
     if (!Optimize(parlist))
         return kFALSE;
 
+    // Copy the result back to be accessible by the user
+    if (fit)
+        hist.GetAlphaFitter().Copy(*fit);
+    // Print the result
+    hist.GetAlphaFitter().Print("result");
+
+    // Store result if requested
     TObjArray cont;
     cont.Add(&contin);
@@ -956 +964 @@
     parlist.AddToList(&list);
 
+    MFillH fillof(&histof, "", "FillHistOff");
     MFillH fillon(&histon, "", "FillHistOn");
-    MFillH fillof(&histof, "", "FillHistOff");
 
     MF f0(Form("M[%d]<0.5", idxdatatype), "FilterOffData");
@@ -975 +983 @@
     tasklist.AddToList(&fillon);
 
+    // Optimize with the tasklist in this parameterlist
     if (!Optimize(parlist))
         return kFALSE;
 
+    // Copy the result back to be accessible by the user
+    if (fit)
+        histon.GetAlphaFitter().Copy(*fit);
+    // Print the result
+    histon.GetAlphaFitter().Print("result");
+
+    // Store result if requested
     TObjArray cont;
     cont.Add(&contin);
@@ -1044 +1060 @@
     tasklist.AddToList(&fill);
 
+    // Optimize with the tasklist in this parameterlist
     if (!Optimize(parlist))
         return kFALSE;
 
+    // Print the result
     hist.Print();
 
+    // Store result if requested
     TObjArray cont;
     cont.Add(&est);