Changeset 7152 for trunk/MagicSoft

Timestamp:

06/13/05 10:33:55 (19 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 (deleted)
• mjobs/MJOptimize.h (deleted)
• mjobs/MJOptimizeCuts.cc (deleted)
• mjobs/MJOptimizeCuts.h (deleted)
• mjobs/MJOptimizeEnergy.cc (deleted)
• mjobs/MJOptimizeEnergy.h (deleted)
• mjobs/Makefile (modified) (1 diff)
• mjoptim (added)
• mjoptim/MJOptimize.cc (added)
• mjoptim/MJOptimize.h (added)
• mjoptim/MJOptimizeCuts.cc (added)
• mjoptim/MJOptimizeCuts.h (added)
• mjoptim/MJOptimizeDisp.cc (added)
• mjoptim/MJOptimizeDisp.h (added)
• mjoptim/MJOptimizeEnergy.cc (added)
• mjoptim/MJOptimizeEnergy.h (added)
• mjoptim/Makefile (added)
• mjoptim/OptimIncl.h (added)
• mjoptim/OptimLinkDef.h (added)
• mtools/MChisqEval.cc (modified) (8 diffs)
• mtools/MChisqEval.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -33 +33 @@
      - improved output
      - added plotting other spectras
+ 
+   * Makefile:
+     - added new directory mjoptim
+
+   * manalysis/MEnergyEstimate.[h,cc]:
+     - derives now from a new more genral class MParameterCalc
+
+   * manalysis/Makefile, manalysis/AnalysisLinkDef.h:
+     - added new class MParamterCalc
+
+   * manalysis/MParameterCalc.[h,cc]:
+     - added new class MParamterCalc
+
+   * mbase/MLog.cc:
+     - do not display 'underline' if fIsNull output
+
+   * mhbase/MBinning.cc:
+     - removed some obsolete comments fixed old stylish SetBinningCos
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - background fit can now be switched off
+     - removed some obsolete comments
+     - adapted Print output
+     - added new option to change signal function type 
+     - adde new Strategy option: kGaussSigma
+
+   * mhflux/MHAlpha.[h,cc]:
+     - output the gauss sigma to the parameter list
+
+   * mhflux/MHThetaSq.h:
+     - mase InitMapping public (used in MJOptimizeDisp)
+
+   * mjobs/JobsLinkDef.h, mjobs/Makefile:
+     - removed MJOptimize*
+
+   * mjobs/MJOptimize.[h,cc]:
+     - allow minimization of something else than MinimizationValue
+
+   * mjobs/MJOptimizeEnergy.[h,cc]:
+     - added class description with example
+     - added weighting task to RunEnergy (untested)
+
+   * mtools/MChisqEval.[h,cc]:
+     - added comments
+     - print result in Postprocess
+     - allow to give a different name to the result
+
+   * mjobs/MJOptimize*:
+     - finally moved to new dir mjoptim
+     - new class MJOptimizeDisp
 
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -380 +380 @@
     return rc;
 }
-
+/*
 Bool_t MAlphaFitter::FitTime(const TH3D &hon, UInt_t bin, Bool_t paint)
 {
@@ -395 +395 @@
     return rc;
 }
-
+*/
 Bool_t MAlphaFitter::FitAlpha(const TH3D &hon, Bool_t paint)
 {

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -35 +35 @@
            MJStar.cc \
            MJCut.cc \
-           MJOptimize.cc \
-           MJOptimizeCuts.cc \
-           MJOptimizeEnergy.cc \
            MJSpectrum.cc
 

trunk/MagicSoft/Mars/mtools/MChisqEval.cc

@@ -25 +25 @@
 /////////////////////////////////////////////////////////////////////////////
 //
+// MChisqEval
+//
+// Evaluates a chisq from one or two MParameterD calculated in an eventloop.
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -30 +33 @@
 
 #include <fstream>
+
+#include "MLog.h"
+#include "MLogManip.h"
 
 #include "MDataChain.h"
@@ -40 +46 @@
 using namespace std;
 
-void MChisqEval::StreamPrimitive(ofstream &out) const
-{
-    out << "   MChisqEval " << GetUniqueName() << ";";
-    if (fData0)
-        out << "   " << GetUniqueName() << ".SetY1(\"" << fData0->GetRule() << "\");" << endl;
-    if (fData1)
-        out << "   " << GetUniqueName() << ".SetY1(\"" << fData1->GetRule() << "\");" << endl;
-}
+const TString MChisqEval::gsDefName  = "MChisqEval";
+const TString MChisqEval::gsDefTitle = "Evaluate a chisq";
 
-MChisqEval::MChisqEval(const char *name, const char *title) : fData0(NULL), fData1(NULL)// : fMatrix(mat), fColumn(col), fEvalE(evale)
+MChisqEval::MChisqEval(const char *name, const char *title) : fData0(NULL), fData1(NULL), fNameResult("MinimizationValue")
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -55 +55 @@
 }
 
-MChisqEval::MChisqEval(MData *y1, const char *name, const char *title) : fData0(NULL), fData1(NULL)// : fMatrix(mat), fColumn(col), fEvalE(evale)
+MChisqEval::MChisqEval(MData *y1, const char *name, const char *title) : fData0(NULL), fData1(NULL), fNameResult("MinimizationValue")
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -62 +62 @@
 }
 
-MChisqEval::MChisqEval(MData *y1, MData *y2, const char *name, const char *title) : fData0(NULL), fData1(NULL)// : fMatrix(mat), fColumn(col), fEvalE(evale)
+MChisqEval::MChisqEval(MData *y1, MData *y2, const char *name, const char *title) : fData0(NULL), fData1(NULL), fNameResult("MinimizationValue")
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -123 +123 @@
             return kFALSE;
 
-    fResult = (MParameterD*)plist->FindCreateObj("MParameterD", "MFitResult");
+    fResult = (MParameterD*)plist->FindCreateObj("MParameterD", fNameResult);
     if (!fResult)
         return kFALSE;
@@ -136 +136 @@
 
     const Double_t dy  = y2-y1;
-    const Double_t err = fData1 ? y1*y1 : 1;
+    const Double_t err = fData1 ? y1*y2 : 1;
 
     fChisq += dy*dy/err;
@@ -144 +144 @@
 Int_t MChisqEval::PostProcess()
 {
-    fChisq /= GetNumExecutions();
+    if (GetNumExecutions()>0)
+        fChisq /= GetNumExecutions();
 
     fResult->SetVal(fChisq);
+
+    *fLog << inf << GetDescriptor() << ": Result=" << fChisq << endl;
 
     return kTRUE;
 }
 
-const TString MChisqEval::gsDefName  = "MChisqEval";
-const TString MChisqEval::gsDefTitle = "Evaluate a chisq";
+void MChisqEval::StreamPrimitive(ofstream &out) const
+{
+    out << "   MChisqEval " << GetUniqueName() << ";";
+    if (fData0)
+        out << "   " << GetUniqueName() << ".SetY1(\"" << fData0->GetRule() << "\");" << endl;
+    if (fData1)
+        out << "   " << GetUniqueName() << ".SetY1(\"" << fData1->GetRule() << "\");" << endl;
+}
 

trunk/MagicSoft/Mars/mtools/MChisqEval.h

@@ -21 +21 @@
     MData   *fData1; // Data Member two (measured data)
 
-    // --------------------------------------------------------------------------
-    //
-    // Implementation of SavePrimitive. Used to write the call to a constructor
-    // to a macro. In the original root implementation it is used to write
-    // gui elements to a macro-file.
-    //
+    TString fNameResult;
+
     void StreamPrimitive(ofstream &out) const;