Changeset 4733 for trunk/MagicSoft/Mars

Timestamp:

08/25/04 17:48:42 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.cc (modified) (4 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (1 diff)

trunk/MagicSoft/Mars/callisto.cc

@@ -76 +76 @@
     gLog << " If running in Mode-C and Mode-Y --iny= is obsolete,  instead --outc=" << endl;
     gLog << " is used." << endl << endl;
+    gLog << " Using  --iny=,  --outc=,  --outy=,  --out=  or --path= automatically" << endl;
+    gLog << " enables the corresponmding modes.  In this case  -c/-y are obsolete." << endl << endl;
     gLog << "Description:" << endl;
     gLog << " callisto will calculate pedestals  from  pedestal-files defined in a" << endl;
@@ -118 +120 @@
     const TString kPath       = arg.GetStringAndRemove("--path=", "");
 
-    const Bool_t  kModeC      = arg.HasOnlyAndRemove("-c");
-    const Bool_t  kModeY      = arg.HasOnlyAndRemove("-y");
+          Bool_t  kModeC      = arg.HasOnlyAndRemove("-c");
+          Bool_t  kModeY      = arg.HasOnlyAndRemove("-y");
+
+    if (!kInpathY.IsNull() || !kOutpathY.IsNull() || !kOutpath.IsNull() || !kPath.IsNull())
+        kModeY = kTRUE;
+    if (!kOutpathC.IsNull() || !kOutpath.IsNull() || !kPath.IsNull())
+        kModeC = kTRUE;
 
     if (!kModeC && !kModeY)
@@ -262 +269 @@
         }
 
-        gLog << endl << endl;
+        gLog << all << endl << endl;
     }
 
@@ -311 +318 @@
         }
 
-        gLog << endl << endl;
+        gLog << all << endl << endl;
     }
 

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -95 +95 @@
     }
 
-    const TString oname = Form("%s/calped%06d.root", (const char*)fPathOut, fSequence.GetSequence());
+    const TString oname = Form("%s/signal%06d.root", (const char*)fPathOut, fSequence.GetSequence());
 
     *fLog << inf << "Writing to file: " << oname << endl;

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -100 +100 @@
 {
     if (fSequence.IsValid())
-        return Form("%s/calped%06d.root", (const char*)fPathOut, fSequence.GetSequence());
+        return Form("%s/pedest%06d.root", (const char*)fPathOut, fSequence.GetSequence());
 
     if (!fRuns)