Changeset 7121 for trunk/MagicSoft

Timestamp:

06/01/05 17:14:46 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mjobs/JobsLinkDef.h (modified) (1 diff)
• mjobs/MJOptimize.cc (modified) (3 diffs)
• mjobs/MJOptimize.h (modified) (3 diffs)
• mjobs/MJOptimizeCuts.cc (added)
• mjobs/MJOptimizeCuts.h (added)
• mjobs/MJOptimizeEnergy.cc (added)
• mjobs/MJOptimizeEnergy.h (added)
• mjobs/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/06/01 Thomas Bretz
+
+   * mjobs/MJOptimize.[h,cc]:
+     - moved code for cut optimization to MJOptimizeCuts
+     - moved code for energy optimization to MJOptimizeEnergy
+
+   * mjobs/MJOptimizeCuts.[h,cc], mjobs/MJOptimizeEnergy.[h,cc]:
+     - added
+
+   * mjobs/Makefile, mjobs/JobsLinkDef.h:
+     - added MJOptimizeCuts
+     - added MJOptimizeEnergy
+
+
+
  2005/06/01 Daniela Dorner
 

trunk/MagicSoft/Mars/NEWS

@@ -47 +47 @@
      For details about the requirements of these plots look
      at the corresponding classes
+
+   - MJOptimize: For On/Off and Wobble optimization MJOptimize
+     has been replaced by MJOptimizeCuts. To use MHThetaSq instead
+     of MHAlpha call MJOptimizeCuts("MHThetaSq"). Make sure in this
+     case MAlphaFitter is setup correctly. For On-Only optimization
+     MJOptimize has been Replaced by MJOptimizeCuts, too. Call
+     RunOn() instead of Run(). For energy estimation MJOptimize
+     has been replaced by MJOptimizeEnergy
 
    - sponde: The input MC spectrum can now be weighted to fake a

trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h

@@ -17 +17 @@
 #pragma link C++ class MJStar+;
 #pragma link C++ class MJCut+;
-#pragma link C++ class MJOptimize+;
 #pragma link C++ class MJSpectrum+;
 
+#pragma link C++ class MJOptimize+;
+#pragma link C++ class MJOptimizeCuts+;
+#pragma link C++ class MJOptimizeEnergy+;
+
 #endif

trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

@@ -90 +90 @@
 #include <TMultiGraph.h>
 
+#include "MHMatrix.h"
+
+// environment
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MDirIter.h"
+#include "MStatusDisplay.h"
+
+// eventloop
 #include "MParList.h"
 #include "MTaskList.h"
-#include "MGeomCamCT1.h"
-#include "MFEventSelector.h"
-#include "MFDataMember.h"
+#include "MEvtLoop.h"
+
+// parameters
+#include "MParameters.h"
+
+// tasks
 #include "MReadTree.h"
-#include "MHMatrix.h"
-#include "MEnergyEstimate.h"
 #include "MMatrixLoop.h"
-#include "MChisqEval.h"
-#include "MEvtLoop.h"
-#include "MDataElement.h"
-#include "MDataMember.h"
-#include "MLog.h"
-#include "MLogManip.h"
-#include "MParameters.h"
 #include "MFillH.h"
+
+// filters
 #include "MF.h"
 #include "MFilterList.h"
-#include "../mfilter/MFMagicCuts.h"
-#include "MContinue.h"
-#include "MGeomCamMagic.h"
-#include "MHillasSrcCalc.h"
-#include "MHMatrix.h"
-#include "MMatrixLoop.h"
-#include "../mhflux/MHAlpha.h"
-#include "MStatusDisplay.h"
-#include "../mhflux/MHEnergyEst.h"
-#include "MDirIter.h"
-#include "MSequence.h"
 
 using namespace std;
@@ -507 +502 @@
 Bool_t MJOptimize::Optimize(MEvtLoop &evtloop)
 {
+    if (fParameters.GetSize()==0)
+    {
+        *fLog << err << GetDescriptor() << "::Optimize: ERROR - Sorry, no parameters defined." << endl;
+        return kFALSE;
+    }
+
     if (fType==kNone)
         return kTRUE;
@@ -806 +807 @@
     *fLog << endl;
 }
-
-//------------------------------------------------------------------------
-//
-Bool_t MJOptimize::Run(const char *fname, MFilter *filter, MAlphaFitter *fit)
-{
-    if (fParameters.GetSize()==0)
-    {
-        *fLog << err << "Sorry, no parameters defined." << endl;
-        return kFALSE;
-    }
-
-    fLog->Separator("Preparing On-only-optimization");
-
-    MParList parlist;
-
-    MGeomCamMagic geom; // For GetConvMm2Deg
-    parlist.AddToList(&geom);
-
-    MHMatrix m("M");
-    AddRulesToMatrix(m);
-    parlist.AddToList(&m);
-
-    MHAlpha hist;
-    hist.SkipHistTime();
-    hist.SkipHistTheta();
-    hist.SkipHistEnergy();
-    hist.InitMapping(&m); 
-
-    if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
-        ((MFMagicCuts*)filter)->InitMapping(&m);
-
-    MReadTree read("Events");
-    read.DisableAutoScheme(); // AutoScheme doesn't seem to be faster!
-    if (fname)
-        read.AddFile(fname);
-    else
-        AddSequences(read, fNamesOn);
-    if (!FillMatrix(read, parlist))
-        return kFALSE;
-
-    MTaskList tasklist;
-    parlist.Replace(&tasklist);
-    if (fit)
-        parlist.AddToList(fit);
-
-    MFilterList list;
-    SetupFilters(list, filter);
-
-    MContinue contin(&list);
-    parlist.AddToList(&list);
-
-    MFillH fill(&hist);
-
-    MMatrixLoop loop(&m);
-
-    tasklist.AddToList(&loop);
-    tasklist.AddToList(&list);
-    tasklist.AddToList(&contin);
-    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);
-    return WriteContainer(cont, fNameOut);
-}
-
-//------------------------------------------------------------------------
-//
-// Make sure, that filter->GetDataMember is correctly implemented!!!!
-//
-Bool_t MJOptimize::RunOnOff(const char *fname, MFilter *filter, MAlphaFitter *fit, const char *tree)
-{
-    if (fParameters.GetSize()==0)
-    {
-        *fLog << err << "Sorry, no parameters defined." << endl;
-        return kFALSE;
-    }
-
-    fLog->Separator("Preparing On/Off-optimization");
-
-    MParList parlist;
-
-    MGeomCamMagic geom; // For GetConvMm2Deg
-    parlist.AddToList(&geom);
-
-    MHMatrix m("M");
-    AddRulesToMatrix(m);
-    parlist.AddToList(&m);
-
-    const Int_t idxdatatype = m.AddColumn("DataType.fVal");
-
-    MHAlpha histon, histof("MHAlphaOff");
-    histon.SkipHistTime();
-    histon.SkipHistTheta();
-    //histon.SkipHistEnergy();
-    histof.SkipHistTime();
-    histof.SkipHistTheta();
-    //histof.SkipHistEnergy();
-    histon.ForceUsingSize();
-    histof.ForceUsingSize();
-    histon.InitMapping(&m, 1);
-    histof.InitMapping(&m, 1);
-
-    if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
-        ((MFMagicCuts*)filter)->InitMapping(&m);
-
-    parlist.AddToList(&histon);
-    parlist.AddToList(&histof);
-
-    if (fname)
-    {
-        MReadTree read(tree);
-        read.DisableAutoScheme(); // AutoScheme doesn't seem to be faster!
-        read.AddFile(fname);
-        if (!FillMatrix(read, parlist))
-            return kFALSE;
-    }
-    else
-    {
-        MParameterI par("DataType");
-        parlist.AddToList(&par);
-
-        gLog.Separator("Reading On-Data");
-        par.SetVal(1);
-        MReadTree readon(tree);
-        readon.DisableAutoScheme(); // AutoScheme doesn't seem to be faster!
-        AddSequences(readon, fNamesOn);
-        if (!FillMatrix(readon, parlist))
-            return kFALSE;
-
-        gLog.Separator("Reading Off-Data");
-        par.SetVal(0);
-        MReadTree readoff(tree);
-        readoff.DisableAutoScheme(); // AutoScheme doesn't seem to be faster!
-        AddSequences(readoff, fNamesOff);
-        if (!FillMatrix(readoff, parlist))
-            return kFALSE;
-    }
-
-    MTaskList tasklist;
-    parlist.Replace(&tasklist);
-    if (fit)
-        parlist.AddToList(fit);
-
-    MFilterList list;
-    SetupFilters(list, filter);
-
-    MContinue contin(&list);
-    parlist.AddToList(&list);
-
-    MFillH fillof(&histof, "", "FillHistOff");
-    MFillH fillon(&histon, "", "FillHistOn");
-
-    MF f0(Form("M[%d]<0.5", idxdatatype), "FilterOffData");
-    MF f1(Form("M[%d]>0.5", idxdatatype), "FilterOnData");
-
-    fillof.SetFilter(&f0);
-    fillon.SetFilter(&f1);
-
-    MMatrixLoop loop(&m);
-
-    tasklist.AddToList(&loop);
-    tasklist.AddToList(&list);
-    tasklist.AddToList(&contin);
-    tasklist.AddToList(&f0);
-    tasklist.AddToList(&f1);
-    tasklist.AddToList(&fillof);
-    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);
-    return WriteContainer(cont, fNameOut);
-}
-
-//------------------------------------------------------------------------
-//
-// Read all events from file which do match rules and optimize
-// energy estimator.
-//
-Bool_t MJOptimize::RunEnergy(const char *fname, const char *rule)
-{
-    if (fParameters.GetSize()==0)
-    {
-        *fLog << err << "Sorry, no parameters defined." << endl;
-        return kFALSE;
-    }
-
-    fLog->Separator("Preparing Energy optimization");
-
-    MParList parlist;
-
-    MParameterI par("DataType");
-    par.SetVal(1);
-    parlist.AddToList(&par);
-
-    MFDataMember filter("DataType.fVal", '>', 0.5);
-    fPreCuts.Add(&filter);
-
-    MGeomCamMagic geom; // For GetConvMm2Deg
-    parlist.AddToList(&geom);
-
-    MHMatrix m("M");
-    AddRulesToMatrix(m);
-    parlist.AddToList(&m);
-
-    MHEnergyEst hist;
-    hist.InitMapping(&m); 
-
-    MEnergyEstimate est("MParameters");
-    est.SetRule(rule);
-    parlist.AddToList(&est);
-
-    MReadTree read("Events");
-    // NECESSARY BECAUSE OF MDataFormula GetRules missing
-    read.DisableAutoScheme();
-    if (fname)
-        read.AddFile(fname);
-    else
-        AddSequences(read, fNamesOn);
-    if (!FillMatrix(read, parlist, kTRUE))
-        return kFALSE;
-
-    fPreCuts.Remove(&filter);
-
-    MTaskList tasklist;
-    parlist.Replace(&tasklist);
-
-    MFillH fill(&hist);
-
-    MMatrixLoop loop(&m);
-
-    tasklist.AddToList(&loop);
-    tasklist.AddToList(&est);
-    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);
-    return WriteContainer(cont, fNameOut);
-}

trunk/MagicSoft/Mars/mjobs/MJOptimize.h

@@ -46 +46 @@
     TList fRules;
     TList fFilter;
-    TList fPreCuts;
-
-    TList fNamesOn;
-    TList fNamesOff;
-
-    TString fNameOut;
 
     void AddPoint(TList *l, Int_t idx, Float_t val) const;
     TList *GetPlots() const;
 
-    void AddRulesToMatrix(MHMatrix &m) const;
-    void SetupFilters(MFilterList &list, MFilter *filter=0) const;
-    Bool_t FillMatrix(MReadTree &read, MParList &l, Bool_t userules=kFALSE);
-
     MEvtLoop *fEvtLoop;    //!
-
-    Bool_t AddSequences(MRead &read, TList &list) const;
 
     // Minuit Interface
@@ -87 +75 @@
 
     Bool_t Optimize(MEvtLoop &evtloop);
+
+protected:
+    TList   fPreCuts;
+
+    TList   fNamesOn;
+    TList   fNamesOff;
+
+    TString fNameOut;
+
+    void   AddRulesToMatrix(MHMatrix &m) const;
+    void   SetupFilters(MFilterList &list, MFilter *filter=0) const;
+    Bool_t AddSequences(MRead &read, TList &list) const;
+    Bool_t FillMatrix(MReadTree &read, MParList &l, Bool_t userules=kFALSE);
 
 public:
@@ -153 +154 @@
     Bool_t Optimize(MParList &list);
 
-    // Special optimizing routines
-    Bool_t Run(const char *fname, MFilter *filter, MAlphaFitter *fit=0);
-    Bool_t Run(const char *fname, MAlphaFitter *fit=0)
-    {
-        return Run(fname, 0, fit);
-    }
-
-    Bool_t Run(MFilter *filter, MAlphaFitter *fit=0)
-    {
-        return Run(0, filter, fit);
-    }
-    Bool_t Run(MAlphaFitter *fit=0)
-    {
-        return Run(0, 0, fit);
-    }
-
-    Bool_t RunOnOff(const char *fname, MFilter *filter, MAlphaFitter *fit=0, const char *tree="Events");
-    Bool_t RunOnOff(const char *fname, MAlphaFitter *fit=0, const char *tree="Events")
-    {
-        return RunOnOff(fname, 0, fit, tree);
-    }
-    Bool_t RunEnergy(const char *fname, const char *rule);
-
-    Bool_t RunOnOff(MFilter *filter, MAlphaFitter *fit=0, const char *tree="Events")
-    {
-        return RunOnOff(0, filter, fit, tree);
-    }
-    Bool_t RunOnOff(MAlphaFitter *fit=0, const char *tree="Events")
-    {
-        return RunOnOff(fit, tree);
-    }
-    Bool_t RunEnergy(const char *rule)
-    {
-        return RunEnergy(0, rule);
-    }
-
     ClassDef(MJOptimize, 0) // Class for optimization of the Supercuts
 };

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -36 +36 @@
            MJCut.cc \
            MJOptimize.cc \
+           MJOptimizeCuts.cc \
+           MJOptimizeEnergy.cc \
            MJSpectrum.cc