Changeset 8902 for trunk

Timestamp:

05/31/08 12:23:05 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• NEWS (modified) (1 diff)
• callisto.cc (modified) (3 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (2 diffs)
• mjobs/MJStar.cc (modified) (1 diff)
• mjobs/MJob.h (modified) (3 diffs)
• star.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+
+ 2008/05/31 Thomas Bretz
+
+   * callisto.cc, star.cc:
+     - added new option "--null" to suppress run-wise output files
+
+   * mjobs/MJob.h:
+     - added new data-member fNullOut to flag suppression of
+       run-wise output files
+
+   * mjobs/MJCalibrateSignal.cc, mjobs/MJStar.cc:
+     - use new option IsNullOut from base class
+
+
+
+
  2008/05/27 Stefan Ruegamer
 
@@ -58 +74 @@
        we now deny any bit in the pattern, but require the calibration
        bit to choose calibration events
+
+   * mbase/MClone.[h,cc]:
+     - instead of cloning the object again and again we now clone
+       it once and then just copy the contents. A new option has
+       been introduced to switch back to the old behaviour
+
+   * mbase/MStatusDisplay.[h,cc]:
+     - changed the argument of GetEmbeddedCanvas from a pointer 
+       to a reference
+
+   * macros/rootlogon.C:
+     - switched on optimization (-O3) for ACLIC
 
 

trunk/MagicSoft/Mars/NEWS

@@ -84 +84 @@
       If the trigger pattern is corrupted events won't pass anymore.
 
+    * Added a new command line option --null to suppress output of
+      Y-files (this is useful for test cases)
+
  ;star
 
     * the star file now contains also the sequence information
+
+    * Added a new command line option --null to suppress output of
+      I-files (this is useful for test cases)
 
  ;ganymed/sponde

trunk/MagicSoft/Mars/callisto.cc

@@ -78 +78 @@
     gLog << "   --path=path               Path to write the all results to [def=local path]" << endl;
     gLog << "                             (overwrites --iny, --outc and --outy)" << endl;
+    gLog << "   --null                    Suppress output of Y-files (for test purpose)" << endl;
     gLog << "   --print-seq               Print Sequence information" << endl;
     gLog << "   --print-files             Print Files taken from Sequence" << endl;
@@ -174 +175 @@
     const Bool_t  kMovie      = arg.HasOnlyAndRemove("--movie");
     const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
+    const Bool_t  kNullOut    = arg.HasOnlyAndRemove("--null");
 //          Bool_t  kMoon       = arg.HasOnlyAndRemove("--moon");
     Int_t kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0;
@@ -619 +621 @@
         job4.SetPathOut(kOutpathY);
         job4.SetMovieMode(kMovie);
+        job4.SetNullOut(kNullOut);
         if (!seq.IsMonteCarlo())
             job4.SetExtractor(job2.GetExtractor());

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -917 +917 @@
     if (fSequence.IsMonteCarlo())
     {
-        if (!fIsMovieMode)
+        if (!fIsMovieMode && !IsNullOut())
             tlist.AddToList(&writemc);
         tlist.AddToList(&contmc);
@@ -929 +929 @@
     //  tlist.AddToList(&pcalc, "Drive");
 
-    if (!fIsMovieMode)
+    if (!fIsMovieMode && !IsNullOut())
         tlist.AddToList(&write);
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -469 +469 @@
         tlist.AddToList(&filldt,  "CC");
     }
-    tlist.AddToList(&write);
+    if (!IsNullOut())
+        tlist.AddToList(&write);
 
     // Create and setup the eventloop

trunk/MagicSoft/Mars/mjobs/MJob.h

@@ -33 +33 @@
     Bool_t    fOverwrite;     // Allow overwriting output files
     Int_t     fMaxEvents;     // Maximum number of events
+
+    Bool_t    fNullOut;       // Suppress output files
 
     // FIXME: Split into MJobSequence and MJobDataSet
@@ -74 +76 @@
     void   SetSequence(const MSequence &seq) { fSequence = seq; }
 
+    void   SetNullOut(Bool_t b=kTRUE) { fNullOut=b; }
+
     // Getter
     TString GetPathOut() const  { return fPathOut; }
@@ -79 +83 @@
 
     Bool_t HasWritePermission(TString fname) const;
+
+    Bool_t HasNullOut() const { return fNullOut; }
 
     // Others

trunk/MagicSoft/Mars/star.cc

@@ -68 +68 @@
     gLog << "   --out=path                Path to write the all results to [def=local path]" << endl;
     gLog << "                             (overwrites --outc and --outy)" << endl;
+    gLog << "   --null                    Suppress output of I-files (for test purpose)" << endl;
     gLog << "   --no-muons                Switch off Muon analysis (for fast tests)" << endl;
     gLog << "   --print-seq               Print Sequence information" << endl;
@@ -121 +122 @@
     const Bool_t  kPrintFound = arg.HasOnlyAndRemove("--print-found");
     const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
+    const Bool_t  kNullOut    = arg.HasOnlyAndRemove("--null");
     Int_t  kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0;
     kDebugEnv = arg.GetIntAndRemove("--debug-env=", kDebugEnv);
@@ -244 +246 @@
         job.SetOverwrite(kOverwrite);
         job.SetPathOut(kOutpath);
+        job.SetNullOut(kNullOut);
         // job.SetPathIn(kInpath); // not yet needed
         if (kNoMuons)