Changeset 8442 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/24/07 15:28:08 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MDataSet.h (modified) (1 diff)
• MJCut.cc (modified) (15 diffs)
• MJCut.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MDataSet.h

@@ -120 +120 @@
     // Setter
     void SetMonteCarlo(Bool_t ismc=kTRUE) { fMonteCarlo=ismc; }
+    void SetWobbleMode(Bool_t wobm=kTRUE)  { fWobbleMode=wobm; }
 
     static Bool_t AddSequencesFromList(const TList &list, MDirIter &files);

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 1/2005 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -26 +26 @@
 //
 //  MJCut
-//
-// FIXME: Preparation for wobble mode missing
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -86 +84 @@
 //
 // Default constructor.  Set defaults for fStoreSummary, fStoreresult,
-// fWriteOnly, fIsWobble and fFullDisplay to kFALSE and initialize
+// fWriteOnly, fFullDisplay to kFALSE and initialize
 // /*fEstimateEnergy and*/ fCalcHadronness with NULL.
 //
 MJCut::MJCut(const char *name, const char *title)
     : fStoreSummary(kFALSE), fStoreResult(kTRUE), fWriteOnly(kFALSE),
-    fIsWobble(kFALSE), fFullDisplay(kTRUE),
+    fFullDisplay(kTRUE),
     fRndmSrcPos(kFALSE), fNameHist("MHThetaSq"), fCalcHadronness(0), fCalcDisp(0)
 {
@@ -330 +328 @@
     EnableStorageOfSummary(GetEnv("SummaryFile", fStoreSummary));
     EnableStorageOfResult(GetEnv("ResultFile", fStoreResult));
-    EnableWobbleMode(GetEnv("WobbleMode", fIsWobble));
     EnableFullDisplay(GetEnv("FullDisplay", fFullDisplay));
     EnableRandomSrcPos(GetEnv("RandomSourcePosition", fRndmSrcPos));
@@ -551 +548 @@
     MParList plist;
 
-    MHSrcPosCam hsrcpos(fIsWobble);
-    if (!fIsWobble && source.IsInitialized() && fRndmSrcPos)
+    MHSrcPosCam hsrcpos(set.IsWobbleMode());
+    if (!set.IsWobbleMode() && source.IsInitialized() && fRndmSrcPos)
     {
         if (!FillSrcPosCam(set, source, hsrcpos))
@@ -614 +611 @@
     MAlphaFitter fit;
     plist.AddToList(&fit);
-    if (fIsWobble)
+    if (set.IsWobbleMode())
         fit.SetScaleMode(MAlphaFitter::kNone);
 
@@ -643 +640 @@
 
     MRead &readoff = set.IsMonteCarlo() ? (MRead&)readoffmc : (MRead&)readoffdata;
-    const Bool_t setrc = fIsWobble ? set.AddFilesOn(readoff) : set.AddFilesOff(readoff);
+    const Bool_t setrc = set.IsWobbleMode() ? set.AddFilesOn(readoff) : set.AddFilesOff(readoff);
     if (!setrc && set.HasOffSequences())
     {
-        *fLog << err << "MDataSet::AddFiles" << (fIsWobble?"On":"Off") << " failed." << endl;
+        *fLog << err << "MDataSet::AddFiles" << (set.IsWobbleMode()?"On":"Off") << " failed." << endl;
         return kFALSE;
     }
@@ -699 +696 @@
     // How to get source position from off- and on-data?
     MSrcPosCalc scalc;
-    scalc.SetMode(fIsWobble?MSrcPosCalc::kWobble:MSrcPosCalc::kOffData); /********************/
+    scalc.SetMode(set.IsWobbleMode()?MSrcPosCalc::kWobble:MSrcPosCalc::kOffData); /********************/
 
     MSrcPosCorrect scor;
@@ -716 +713 @@
     tlist2.AddToList(&scor);
     tlist2.AddToList(&srcrndm);
-    //if (fRndmSrcPos && !fIsWobble)
+    //if (fRndmSrcPos && !set.IsWobbleMode())
     //   tlist2.AddToList(&fill0a);
     tlist2.AddToList(&hcalc);
-    if (fIsWobble)
+    if (set.IsWobbleMode())
         tlist2.AddToList(&hcalc2);
     //tlist2.AddToList(&taskenv1);
@@ -732 +729 @@
         tlist2.AddToList(&fill1a);
     tlist2.AddToList(&cont1);
-    if (!fWriteOnly && (!fIsWobble || !fNameHistFS.IsNull()))
+    if (!fWriteOnly && (!set.IsWobbleMode() || !fNameHistFS.IsNull()))
         tlist2.AddToList(&ffs);
     tlist2.AddToList(&cont2);
@@ -796 +793 @@
         return kFALSE;
 
-    if (set.HasOffSequences() || fIsWobble)
+    if (set.HasOffSequences() || set.IsWobbleMode())
     {
         // Execute first analysis
@@ -852 +849 @@
     fill7b.SetNameTab("NewPar");
     //fill9b.SetNameTab("EffOnT");
-    fill1b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
-    fill2b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
-    fill3b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
-    fill4b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
-    fill5b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
-    fill6b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
-    fill7b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
+    fill1b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
+    fill2b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
+    fill3b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
+    fill4b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
+    fill5b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
+    fill6b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
+    fill7b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
 
     //fill9b.SetFilter(&fbin);
@@ -903 +900 @@
 
     tlist.Replace(&readon);
-    if (fRndmSrcPos && !fIsWobble)
+    if (fRndmSrcPos && !set.IsWobbleMode())
     {
 //        tlist2.RemoveFromList(&fill0a);
@@ -911 +908 @@
     MFillH fillsrc(&hsrcpos, "MSrcPosCam", "FillSrcPosCam");
     fillsrc.SetNameTab("SrcPos");
-    if (fIsWobble)
+    if (set.IsWobbleMode())
         tlist2.AddToListBefore(&fillsrc, &hcalc);
 
@@ -936 +933 @@
         //if (!fIsMonteCarlo)
         //    tlist2.Replace(&fill9b);
-        if (!fIsWobble || !fNameHist.IsNull())
+        if (!set.IsWobbleMode() || !fNameHist.IsNull())
             tlist2.Replace(&ffs2);
-        if (fIsWobble)
+        if (set.IsWobbleMode())
         {
             tlist2.AddToListAfter(&fillphi, &falpha2);

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -21 +21 @@
     Bool_t  fStoreResult;
     Bool_t  fWriteOnly;
-    Bool_t  fIsWobble;
     Bool_t  fFullDisplay;
     Bool_t  fRndmSrcPos;
@@ -59 +58 @@
     void EnableStorageOfResult(Bool_t b=kTRUE)   { fStoreResult  = b; } // See SetNameResult
     void EnableWriteOnly(Bool_t b=kTRUE)         { fWriteOnly    = b; }
-    void EnableWobbleMode(Bool_t b=kTRUE)        { fIsWobble     = b; }
     void EnableFullDisplay(Bool_t b=kTRUE)       { fFullDisplay  = b; }
     void EnableRandomSrcPos(Bool_t b=kTRUE)      { fRndmSrcPos   = b; }