Changeset 7116 for trunk/MagicSoft/Mars

Timestamp:

05/31/05 12:53:41 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• merpp.cc (modified) (5 diffs)
• mtools/MTMinuit.cc (deleted)
• mtools/MTMinuit.h (deleted)

trunk/MagicSoft/Mars/Changelog

@@ -60 +60 @@
      - assume that the run-type is real-data if Process is called before
        ReInit
+
+   * merpp.cc:
+     - new options: --auto-time-start --auto-time-stop
 
 

trunk/MagicSoft/Mars/NEWS

@@ -14 +14 @@
      that also the very first Drive-events in a run are treated 
      correctly.
+
+   - merpp: new options: --auto-time-start --auto-time-stop which
+     allow to cut updating with slow-control at the start- or 
+     (previousle --auto-time only allowed: and) stop-time of
+     the run stored in the runheader.
 
    - callisto: changed default of fgFallTimeHiGain in 

trunk/MagicSoft/Mars/merpp.cc

@@ -83 +83 @@
 //    gLog << "   --sql=mysql://user:password@url  Insert run into database" << endl << endl;
     gLog << " Report File Options:" << endl;
-    gLog << "   --auto-time               Take time automatically from MRawRunHeader" << endl;
-    gLog << "                             (overwrites --start= and/or --stop=)" << endl;
+    gLog << "   --auto-time-start         Take time automatically from MRawRunHeader" << endl;
+    gLog << "                             (overwrites --start=)" << endl;
+    gLog << "   --auto-time-stop          Take time automatically from MRawRunHeader" << endl;
+    gLog << "                             (overwrites --stop=)" << endl;
+    gLog << "   --auto-time               Abbreviation for --auto-time-start and auto-time-stop" << endl;
     gLog << "   --start=date/time         Start event time" << endl;
     gLog << "   --stop=date/time          Stop  event time" << endl;
@@ -116 +119 @@
 }
 
-void GetTimeFromFile(const char *fname, MTime &start, MTime &stop)
+void GetTimeFromFile(const char *fname, MTime *start, MTime *stop)
 {
     TFile f(fname, "READ");
@@ -136 +139 @@
     }
 
-    if (!start)
-        start = h->GetRunStart();
-    if (!stop)
-        stop = h->GetRunEnd();
+    if (start && !*start)
+        *start = h->GetRunStart();
+    if (stop && !*stop)
+        *stop = h->GetRunEnd();
 }
 
@@ -161 +164 @@
     }
 
-    const Int_t  kComprlvl   = arg.GetIntAndRemove("-c", 2);
-    const Bool_t kInterleave = arg.GetIntAndRemove("--interleave=", 1);
-    const Bool_t kForce      = arg.HasOnlyAndRemove("-f");
-    const Bool_t kForceProc  = arg.HasOnlyAndRemove("-ff");
-    const Int_t  kRunNumber  = arg.GetIntAndRemove("--run=", -1);
-    const Bool_t kAutoTime   = arg.HasOnlyAndRemove("--auto-time");
-          Int_t  kRunFile    = arg.GetIntAndRemove("--runfile=", -1);
-          Bool_t kUpdate     = arg.HasOnlyAndRemove("--update") || arg.HasOnlyAndRemove("-u");
+    const Int_t  kComprlvl      = arg.GetIntAndRemove("-c", 2);
+    const Bool_t kInterleave    = arg.GetIntAndRemove("--interleave=", 1);
+    const Bool_t kForce         = arg.HasOnlyAndRemove("-f");
+    const Bool_t kForceProc     = arg.HasOnlyAndRemove("-ff");
+    const Int_t  kRunNumber     = arg.GetIntAndRemove("--run=", -1);
+    const Bool_t kAutoTime      = arg.HasOnlyAndRemove("--auto-time");
+    const Bool_t kAutoTimeStart = arg.HasOnlyAndRemove("--auto-time-start") || kAutoTime;
+    const Bool_t kAutoTimeStop  = arg.HasOnlyAndRemove("--auto-time-stop")  || kAutoTime;
+          Int_t  kRunFile       = arg.GetIntAndRemove("--runfile=", -1);
+          Bool_t kUpdate        = arg.HasOnlyAndRemove("--update") || arg.HasOnlyAndRemove("-u");
 
     MTime kTimeStart;
@@ -258 +263 @@
     // Evaluate possible start-/stop-time
     //
-    if (kAutoTime && kUpdate && (isreport || isdc))
-        GetTimeFromFile(kNameout, kTimeStart, kTimeStop);
+    if ((kAutoTimeStart || kAutoTimeStop) && kUpdate && (isreport || isdc))
+        GetTimeFromFile(kNameout, kAutoTimeStart?&kTimeStart:0, kAutoTimeStop?&kTimeStop:0);
 
     if (kTimeStart)