Changeset 8636 for trunk/MagicSoft/Mars/mjobs

Timestamp:

07/15/07 19:25:45 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MDataSet.cc (modified) (4 diffs)
• MJCut.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -38 +38 @@
 //       SequencesOff: 36817
 //
+//       SequencePath: /magic/sequences
+//       DataPath:     /magic/data/star
+//
 //       Sequence00035222.File: sequences/sequence035222.txt
 //       Sequence00036817.File: sequences/sequence036817.txt
@@ -44 +47 @@
 //       Sequence00036817.Dir: /data2/wuerzburg/Crab-Analyse/images/036817
 //
-// The analysis number is an artifical number used to name the output
-// files automatically if the names are not overwritten in the corresponding
-// programs.
-//
-// The sequence number are used to concatenate the filenames of the
-// sequences using the file structure used in the datacenter. Each sequence
-// can be added to the on and off data at the same time but only once.
+//       MonteCarlo: No
+//
+// AnalysisNumber: The analysis number is an artifical number used to name
+// the output files automatically if the names are not overwritten in the
+// corresponding programs.
+//
+// SequencePath: In case it is not specified the datacenter default path is
+// used. If it is given it is the place at which the sequence files
+// are searched, if not overwritten by either a program command line
+// option (aka. a argument to the constructor) or a resource for
+// an individual sequence file. Note, that the four digits high-level
+// directories to sort the sequences are added to the given path.
+//
+// DataPath: In case it is not specified the datacenter default path is
+// used. If it is given it is the place at which the data files
+// are searched, if not overwritten by either a program command line
+// option (aka. a argument to the constructor) or a resource for
+// an individual data path.  Note, that the four digits high-level
+// directories to sort the sequences are added to the given path.
+//
+// SequencesOn/Off: The sequence number are used to concatenate the filenames
+// of the sequences using the file structure used in the datacenter. Each
+// sequence can be added to the on and off data at the same time but only
+// once.
 //
 // If you have different file names you can overwrite the default file names
@@ -59 +79 @@
 // overwrite the directories in which the sequence-files (eg I-files) are
 // stored using Sequence%08d.Dir (make sure you have 8 digits!)
+//
+//
 //
 // Resource file entries are case sensitive!
@@ -226 +248 @@
     fComment      = env.GetValue("Comment",    "");
 
-    SetupDefaultPath(sequences, GetDefPathSequences());
-    SetupDefaultPath(data,      GetDefPathDataFiles());
+    const TString defpathseq  = env.GetValue("SequencePath", GetDefPathSequences());
+    const TString defpathdata = env.GetValue("DataPath",     GetDefPathDataFile());
+
+    SetupDefaultPath(sequences, defpathseq);
+    SetupDefaultPath(data,      defpathdata);
 
     fPathSequences = sequences;

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -873 +873 @@
 
     scalc.SetMode(MSrcPosCalc::kDefault);
+    scalc.SetNumRandomOffPositions(fNumOffSourcePos);
 
     MFillH fill1b("MHHillasOnPre  [MHHillas]",      "MHillas",      "FillHillasPre");
@@ -947 +948 @@
     MFillH fillsrc(&hsrcpos, "MSrcPosCam", "FillSrcPosCam");
     fillsrc.SetNameTab("SrcPos");
-    if (set.IsWobbleMode() & !set.IsMonteCarlo())
+
+    if (set.IsWobbleMode() && !set.IsMonteCarlo())
         tlist2.AddToListBefore(&fillsrc, &hcalc);
 
@@ -983 +985 @@
         if (!set.IsMonteCarlo())
             tlist.AddToList(&fillvs, "EffectiveOnTime");
-        else
-            tlist2.AddToListBefore(&fillvs, &scalc);
+
+        // It is not really necessary to re-calculate the image parameters
+        // for the the on-source for MCs, but it is done for symmetry reasons
+        tlist2.AddToListBefore(&fillvs, &scalc);
     }