Changeset 6948 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/18/05 10:17:03 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCut.cc (modified) (5 diffs)
• MJCut.h (modified) (4 diffs)
• MJOptimize.cc (modified) (4 diffs)
• MJOptimize.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -227 +227 @@
 // analysis number num, see GetOutputFile()
 //
-Bool_t MJCut::WriteResult(UInt_t num) const
+Bool_t MJCut::WriteResult(const MParList &plist, UInt_t num) const
 {
     TObjArray arr;
+
+    TIter Next(plist);
+    TObject *o=0;
+    while ((o=Next()))
+        if (o->InheritsFrom(MBinning::Class()))
+            arr.Add(o);
+
     return WriteContainer(arr, GetOutputFile(num), "UPDATE");
 }
@@ -278 +285 @@
     write->AddContainer("MHillas",        "Events");
     write->AddContainer("MHillasSrc",     "Events");
+    write->AddContainer("MHillasExt",     "Events");
     write->AddContainer("MPointingPos",   "Events");
     write->AddContainer("MHillasSrcAnti", "Events", kFALSE);
@@ -293 +301 @@
 }
 
+void MJCut::DisplayResult(const MParList &plist) const
+{
+    /*
+     TObject *h1 = plist.FindObject("MHHillasOffPre",  "MHHillas");
+     TObject *h2 = plist.FindObject("MHHillasOffPost", "MHHillas");
+     TObject *h3 = plist.FindObject("MHVsSizeOffPost", "MHVsSize");
+     TObject *h4 = plist.FindObject("MHHilExtOffPost", "MHHillasExt");
+     TObject *h5 = plist.FindObject("MHHilSrcOffPost", "MHHillasSrc");
+     TObject *h6 = plist.FindObject("MHImgParOffPost", "MHImagePar");
+     TObject *h7 = plist.FindObject("MHNewParOffPost", "MHNewImagePar");
+     */
+}
+
 Bool_t MJCut::ProcessFile(const MDataSet &set)
 {
@@ -342 +363 @@
     MBinning bins3(50, 0,  60,   "BinningTheta",     "cos");
     MBinning bins4("BinningFalseSource");
-    //MBinning bins5("BinningWidth");
-    //MBinning bins6("BinningLength");
-    //MBinning bins7("BinningDist");
+    MBinning bins5("BinningWidth");
+    MBinning bins6("BinningLength");
+    MBinning bins7("BinningDist");
+    MBinning bins8("BinningMaxDist");
     plist.AddToList(&bins1);
     plist.AddToList(&bins2);
     plist.AddToList(&bins3);
     plist.AddToList(&bins4);
-    //plist.AddToList(&bins5);
-    //plist.AddToList(&bins6);
-    //plist.AddToList(&bins7);
+    plist.AddToList(&bins5);
+    plist.AddToList(&bins6);
+    plist.AddToList(&bins7);
+    plist.AddToList(&bins8);
 
     // --------------------------------------------------------------------------------
@@ -623 +646 @@
     tlist.PrintStatistics();
 
+    DisplayResult(plist);
+
     // FIXME: Perform fit and plot energy dependant alpha plots
     // and fit result to new tabs!
-    if (!WriteResult(set.GetNumAnalysis()))
+    if (!WriteResult(plist, set.GetNumAnalysis()))
         return kFALSE;
 

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -8 +8 @@
 class MTask;
 class MDataSet;
+class MParList;
 class MWriteRootFile;
 
@@ -18 +19 @@
     Bool_t  fIsWobble;
     Bool_t  fFullDisplay;
+    //Bool_t  fSubstraction;
 
     TString fNameSummary;
@@ -30 +32 @@
     void    SetupWriter(MWriteRootFile *write, const char *name) const;
     Bool_t  WriteTasks(UInt_t num, TObjArray &cont) const;
-    Bool_t  WriteResult(UInt_t num) const;
+    Bool_t  WriteResult(const MParList &plist, UInt_t num) const;
+    void    DisplayResult(const MParList &plist) const;
 
     Bool_t  CanStoreSummary() const { return !fPathOut.IsNull() && fStoreSummary; }
@@ -46 +49 @@
     void EnableWobbleMode(Bool_t b=kTRUE)        { fIsWobble     = b; }
     void EnableFullDisplay(Bool_t b=kTRUE)       { fFullDisplay  = b; }
+    //void EnableSubstraction(Bool_t b=kTRUE)      { fSubstraction = b; }
 
     void SetNameSummaryFile(const char *name="");

trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

@@ -228 +228 @@
 }
 
-MJOptimize::MJOptimize() : fDebug(-1), fNumEvents(0), fType(kSimplex), fNumMaxCalls(0), fTolerance(0), fTestTrain(kFALSE)
+MJOptimize::MJOptimize() : fDebug(-1), fNumEvents(0), fType(kSimplex), fNumMaxCalls(0), fTolerance(0), fTestTrain(0)
 {
     fRules.SetOwner();
@@ -661 +661 @@
     case kMigrad:    txt += "Migrad";    break;
     case kMinimize:  txt += "Minimize";  break;
-    case kMinos:     txt += "Minot";     break;
+    case kMinos:     txt += "Minos";     break;
     case kImprove:   txt += "Improve";   break;
     case kSimplex:   txt += "Simplex";   break;
@@ -682 +682 @@
     // In case the reader is the matrix loop and testrain is enabled
     // switch on even mode...
-    if (loop && fTestTrain)
-        loop->SetOperationMode(MMatrixLoop::kEven);
+    if (loop && TMath::Abs(fTestTrain)>0)
+        loop->SetOperationMode(fTestTrain>0?MMatrixLoop::kEven:MMatrixLoop::kOdd);
 
     if (!Optimize(evtloop))
@@ -696 +696 @@
     // In case the reader is the matrix loop and testrain is enabled
     // switch on odd mode...
-    if (!loop || !fTestTrain)
+    if (!loop || fTestTrain==0)
         return kTRUE;
 
-    loop->SetOperationMode(MMatrixLoop::kOdd);
+    loop->SetOperationMode(fTestTrain<0?MMatrixLoop::kEven:MMatrixLoop::kOdd);
 
     // Done already in Fcn

trunk/MagicSoft/Mars/mjobs/MJOptimize.h

@@ -84 +84 @@
     UInt_t  fNumMaxCalls;
     Float_t fTolerance;
-    Bool_t  fTestTrain;
+    Int_t   fTestTrain;
 
     Bool_t Optimize(MEvtLoop &evtloop);
@@ -110 +110 @@
     void SetNumMaxCalls(UInt_t num=0) { fNumMaxCalls=num; }
     void SetTolerance(Float_t tol=0)  { fTolerance=tol; }
-    void EnableTestTrain(Bool_t b=kTRUE) { fTestTrain=b; }
+    void EnableTestTrain(Int_t b=2)   { fTestTrain=b; }
 
     // Parameter access