Changeset 9012 for trunk/MagicSoft/Mars/mjobs

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MSequence.cc (modified) (3 diffs)
• MSequence.h (modified) (2 diffs)

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;