Changeset 9012 for trunk/MagicSoft

Timestamp:

07/18/08 19:41:12 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MTime.cc (modified) (1 diff)
• mjobs/MSequence.cc (modified) (3 diffs)
• mjobs/MSequence.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2008/07/18 Thomas Bretz
+
+   * datacenter/macros/buildsequenceentries.C:
+     - Use the GetId also in the constructor of Rule
+     - fixed reading of the sections in the sequences.rc
+
+   * mbase/MTime.cc:
+     - GetStringFmt was taking the daylight saving time into account
+       (hopefully this fix is not too much dependent on the kernel)
+
+   * mjobs/MSequence.cc:
+     - added some preliminary code for comparing two sequences
+     - fixed output in Print (the "s" was missing in LightConditions)
+     - do not write the "Run[0-]*" line for anything else than
+       the "Runs" (needs more fixes)
+
+
+
  2008/07/17 Thomas Bretz
 
@@ -102 +120 @@
      - commmented out caco files
      - write telescope run and file-number to the file
+     - some simplification
 
 

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -759 +759 @@
     time.tm_mon   = mon-1;
     time.tm_year  = y-1900;
-    time.tm_isdst = 0;
-
+    time.tm_isdst = -1;
+
+    // -1: If dst, isdst is set to 1 but hour is not changed
+    //  0: If dst, hour is changed
+
+    // Get old local
     const TString locale = setlocale(LC_TIME, 0);
 
+    // Set new local (e.g. Montag instead of Monday)
     setlocale(LC_TIME, loc);
 
     // recalculate tm_yday and tm_wday
-    mktime(&time);
+    if (mktime(&time)<0)
+        return "";
 
     char ret[128];

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -705 +705 @@
 }
 
+static int operator==(const TArrayI &a, const TArrayI &b)
+{
+    return a.GetSize()==b.GetSize() ?
+        memcmp(a.GetArray(), b.GetArray(), a.GetSize()*sizeof(Int_t))==0 :
+        false;
+}
+
+static int IsNull(const TArrayI &a)
+{
+    if (a.GetSize()==0)
+        return true;
+
+    return a.GetSize()==0 ? true : a==TArrayI(a.GetSize());
+}
+
+static int IsNull(const TArrayI &a, const TArrayI &b)
+{
+    return IsNull(a) && IsNull(b);
+}
+
+Bool_t MSequence::IsSimilar(const MSequence &s) const
+{
+    return // Mandatory
+        fTelescope==s.fTelescope && fSequence==s.fSequence &&
+        fNight==s.fNight
+        && fLightCondition==s.fLightCondition &&
+
+        fMonteCarlo==s.fMonteCarlo &&
+
+        (fRunsSub    ==s.fRunsSub     || IsNull(fRunsSub,     s.fRunsSub))     &&
+        (fCalRunsSub ==s.fCalRunsSub  || IsNull(fCalRunsSub,  s.fCalRunsSub))  &&
+        (fPedRunsSub ==s.fPedRunsSub  || IsNull(fPedRunsSub,  s.fPedRunsSub))  &&
+        (fDatRunsSub ==s.fDatRunsSub  || IsNull(fDatRunsSub,  s.fDatRunsSub))  &&
+        (fExclRunsSub==s.fExclRunsSub || IsNull(fExclRunsSub, s.fExclRunsSub))
+        ;
+}
+
+Bool_t MSequence::IsIdentical(const MSequence &s) const
+{
+    return IsSimilar(s) &&
+        // Unnecessary
+        fStart==s.fStart         && fLastRun==s.fLastRun   &&
+        fNumEvents==s.fNumEvents && fPeriod==s.fPeriod     &&
+        fProject==s.fProject     && fSource==s.fSource     &&
+        /*fTriggerTable==s.fTriggerTable &&*/ fHvSettings==s.fHvSettings;
+}
+
+Bool_t MSequence::operator==(const MSequence &s) const
+{
+    return IsIdentical(s) &&
+        // Obsolete
+        fDataPath==s.fDataPath && fFileName==s.fFileName;
+}
+
 //---------------------------------------------------------------------------
 //
@@ -927 +981 @@
         out << pre << "Night:          " << fNight.GetStringFmt("%Y-%m-%d") << endl;
     out << endl;
-    out << pre << "LightCondition: ";
+    out << pre << "LightConditions: ";
     switch (fLightCondition)
     {
@@ -965 +1019 @@
     {
         str += PrintRuns(out, pre, "Runs:     ", fRuns,     fRunsSub);
-        str += PrintRuns(out, pre, "CalRuns:  ", fCalRuns,  fCalRunsSub);
-        str += PrintRuns(out, pre, "PedRuns:  ", fPedRuns,  fPedRunsSub);
-        str += PrintRuns(out, pre, "DataRuns: ", fDatRuns,  fDatRunsSub);
-        str += PrintRuns(out, pre, "Exclude:  ", fExclRuns, fExclRunsSub);
+        /*str +=*/ PrintRuns(out, pre, "CalRuns:  ", fCalRuns,  fCalRunsSub);
+        /*str +=*/ PrintRuns(out, pre, "PedRuns:  ", fPedRuns,  fPedRunsSub);
+        /*str +=*/ PrintRuns(out, pre, "DataRuns: ", fDatRuns,  fDatRunsSub);
+        /*str +=*/ PrintRuns(out, pre, "Exclude:  ", fExclRuns, fExclRunsSub);
     }
 

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -22 +22 @@
         kCalibrated, kImages
     };
+
 private:
     TString fFileName;         // Expanded file name
@@ -115 +116 @@
         fExclRunsSub(s.fExclRunsSub), fMonteCarlo(s.fMonteCarlo) { }
 
+    Bool_t IsSimilar(const MSequence &s) const;
+    Bool_t IsIdentical(const MSequence &s) const;
+    Bool_t operator==(const MSequence &s) const;
+
     // I/O
     Bool_t WriteFile(const char *filename, const Option_t *o) const;