Changeset 3832 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/26/04 16:44:20 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (4 diffs)
• MJCalibration.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -141 +141 @@
 using namespace std;
 
+const Int_t MJCalibration::gkIFAEBoxInaugurationRun = 20113;
 // --------------------------------------------------------------------------
 //
@@ -863 +864 @@
 // --------------------------------------------------------------------------
 //
+// Find the colour of the pulsing LED:
+// - If the run number is smaller than gkIFAEBoxInaugurationRun, take MCalibrationCam::kCT1
+// - Otherwise find the colour out of the run name
+// - If no colour is found, return kFALSE
+// 
+Bool_t MJCalibration::FindColor() 
+{
+
+  const UInt_t nruns = fRuns->GetNumRuns();
+
+  if (nruns == 0)
+    return kFALSE;
+  
+  TArrayI arr = fRuns->GetRuns();
+
+  if (arr[nruns-1] < gkIFAEBoxInaugurationRun)
+    {
+      *fLog << "Found colour kCT1 in runs: " << fRuns->GetRunsAsString() << endl;
+      fColor = MCalibrationCam::kCT1;
+      return kTRUE;
+    }
+  
+  TString filenames;
+
+  while (!(filenames=((MDirIter*)fRuns)->Next()).IsNull())
+    {
+
+      filenames.ToLower();
+
+      if (filenames.Contains("green"))
+        if (fColor == MCalibrationCam::kNONE)
+          {
+            *fLog << "Found colour: kGREEN  in " << filenames << endl;
+            fColor = MCalibrationCam::kGREEN;
+          }
+        else if (fColor != MCalibrationCam::kGREEN)
+          {
+            *fLog << err << "Different colour found in " << filenames << "... abort" << endl;
+            return kFALSE;
+          }
+
+      if (filenames.Contains("blue"))
+        if (fColor == MCalibrationCam::kNONE)
+          {
+            *fLog << "Found colour: kBLUE  in " << filenames << endl;
+            fColor = MCalibrationCam::kBLUE;
+          }
+        else if (fColor != MCalibrationCam::kBLUE)
+          {
+            *fLog << err << "Different colour found in " << filenames << "... abort" << endl;
+            return kFALSE;
+          }
+
+      if (filenames.Contains("uv"))
+        if (fColor == MCalibrationCam::kNONE)
+          {
+            *fLog << "Found colour: kUV in " << filenames << endl;
+            fColor = MCalibrationCam::kUV;
+          }
+        else if (fColor != MCalibrationCam::kUV)
+          {
+            *fLog << err << "Different colour found in " << filenames << "... abort" << endl;
+            return kFALSE;
+          }
+
+      if (filenames.Contains("ct1"))
+        if (fColor == MCalibrationCam::kNONE)
+          {
+            *fLog << "Found colour: kCT1  in " << filenames << endl;
+            fColor = MCalibrationCam::kCT1;
+          }
+        else if (fColor != MCalibrationCam::kCT1)
+          {
+            *fLog << err << "Different colour found in " << filenames << "... abort" << endl;
+            return kFALSE;
+          }
+      
+    }
+  
+  if (fColor == MCalibrationCam::kNONE)
+    {
+      *fLog <<  "No colour found in filenames of runs: " << fRuns->GetRunsAsString() 
+           << "... abort" << endl;
+      return kFALSE;      
+    }
+
+  return kTRUE;
+}
+
+
+
+
+// --------------------------------------------------------------------------
+//
 // Retrieve the output file written by WriteResult()
 // 
@@ -891 +986 @@
 //
 // - Check if there are fRuns, otherwise return
+// - Check the colour of the files in fRuns (FindColor()), otherwise return
 // - Check for consistency between run numbers and number of files
 // - Add fRuns to MReadMarsFile
@@ -930 +1026 @@
   if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
     {
-      *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
+      *fLog << err << "Number of files found doesn't match number of runs... abort." 
+            << fRuns->GetNumRuns() << " vs. " << fRuns->GetNumEntries() << endl;
       return kFALSE;
     }
-  
+
   *fLog << inf;
   fLog->Separator(GetDescriptor());
+
+  if (!FindColor())
+    return kFALSE;
+  
   *fLog << "Calculate MCalibrationCam from Runs " << fRuns->GetRunsAsString() << endl;
   *fLog << endl;

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -24 +24 @@
 {
 private:
+
+  static const Int_t gkIFAEBoxInaugurationRun;              // Run number of first IFAE box calibration
 
   TString fOutputPath;                                     // Path to the output files
@@ -52 +54 @@
   void   DisplayResult(MParList &plist);
   Bool_t WriteResult();
-
+  Bool_t FindColor();
+  
 public: