Changeset 5056 for trunk/MagicSoft/Mars/mcalib

Timestamp:

09/16/04 00:08:33 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibColorSet.cc (modified) (2 diffs)
• MCalibColorSteer.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc

@@ -232 +232 @@
       if (proj.Contains(gre0))
         { fPattern |= k01LedGreen; color = kGREEN;    }
-      TRegexp gre1("[1][lL]?[eE]?[dD]?[sS]?[gG][rR][eE][eE]");
+      TRegexp gre1("1[lL]?[eE]?[dD]?[sS]?[gG][rR][eE][eE]");
       if (proj.Contains(gre1))
         { fPattern |= k1LedGreen; color = kGREEN;    }
@@ -255 +255 @@
 
       // Possible green combinations
-      TRegexp blu0("[0.1][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu0("0.1[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu0))
         { fPattern |= k01LedBlue; color = kBLUE;    }
-      TRegexp blu1("[1][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu1("1[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu1))
         { fPattern |= k1LedBlue; color = kBLUE;    }
-      TRegexp blu2("[2][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu2("2[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu2))
         { fPattern |= k2LedBlue; color = kBLUE;    }
-      TRegexp blu3("[3][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu3("3[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu3))
         { fPattern |= k3LedBlue; color = kBLUE;    }
-      TRegexp blu5("[5][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu5("5[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu5))
         { fPattern |= k5LedBlue1; color = kBLUE;    }
-      TRegexp blu6("[6][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu6("6[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu6))
         { fPattern |= k6LedBlue; color = kBLUE;    }
-      TRegexp blu7("[7][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu7("7[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu7))
         { fPattern |= k7LedBlue; color = kBLUE;    }
-      TRegexp blu8("[8][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu8("8[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu8))
         { fPattern |= k8LedBlue; color = kBLUE;    }
-      TRegexp blu10("[10][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu10("10[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu10))
         { fPattern |= k10LedBlue; color = kBLUE;    }
-      TRegexp blu15("[15][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu15("15[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu15))
         { fPattern |= k15LedBlue; color = kBLUE;    }
-      TRegexp blu20("[20][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu20("20[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu20))
         { fPattern |= k20LedBlue; color = kBLUE;    }
-      TRegexp blu21("[21][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu21("21[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu21))
         { fPattern |= k21LedBlue; color = kBLUE;    }
-      TRegexp blu22("[22][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu22("22[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu22))
         { fPattern |= k22LedBlue; color = kBLUE;    }
-      TRegexp blu23("[23][lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
+      TRegexp blu23("23[lL]?[eE]?[dD]?[sS]?[bB][lL][uU][eE]");
       if (proj.Contains(blu23))
         { fPattern |= k23LedBlue; color = kBLUE;    }

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -148 +148 @@
     fChargeCalc   = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc");
 
-    *fLog << inf << " Found MHCalibrationChargeCam ... " << endl;
+    *fLog << inf << "Found MHCalibrationChargeCam ... " << flush;
 
     if (!fIntensCharge)
@@ -179 +179 @@
     fRelTimeCalc   = (MCalibrationRelTimeCalc*)tlist->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
 
-    *fLog << inf << GetDescriptor() 
-          << ": Found MHCalibrationRelTimeCam ... " << endl;
+    *fLog << inf << "Found MHCalibrationRelTimeCam ... " << flush;
 
     if (!fIntensRelTime)
@@ -223 +222 @@
   //
   *fLog << inf << GetDescriptor() << " : Finalize calibration histograms..." << flush;
-  if (Finalize("MHCalibrationChargeCam"))   *fLog << "MHCalibrationChargeCam";
-  if (Finalize("MHCalibrationChargeBlindCam"))    *fLog << "MHCalibrationChargeBlindCam";
-  if (Finalize("MHCalibrationRelTimeCam"))  *fLog << "MHCalibrationRelTimeCam";  
-  if (Finalize("MHCalibrationTestCam"))     *fLog << "MHCalibrationChargeCam";  
-  if (Finalize("MHCalibrationTestTimeCam")) *fLog << "MHCalibrationChargeCam";  
+  if (Finalize("MHCalibrationChargeCam"))      *fLog << "MHCalibrationChargeCam";
+  if (Finalize("MHCalibrationChargeBlindCam")) *fLog << "MHCalibrationChargeBlindCam";
+  if (Finalize("MHCalibrationRelTimeCam"))     *fLog << "MHCalibrationRelTimeCam";  
+  if (Finalize("MHCalibrationTestCam"))        *fLog << "MHCalibrationChargeCam";  
+  if (Finalize("MHCalibrationTestTimeCam"))    *fLog << "MHCalibrationChargeCam";  
 
   //
   // Finalize possible calibration calculation tasks
   //
+  *fLog << endl;
   *fLog << inf << GetDescriptor() << " : Finalize calibration calculations..." << flush;
   if (fChargeCalc)
@@ -273 +273 @@
 {
 
+  *fLog << endl;
+  
   if (fIntensBad)
     {
@@ -288 +290 @@
       *fLog << inf << "New MCalibrationQECam with " << GetNamePattern() << endl;
     }
-  if (fIntensRelTime)
-    {
-      fIntensRelTime->AddToList(Form("MCalibrationRelTimeCam%s",GetNamePattern()),*fGeom);
-      *fLog << inf << "New MCalibrationRelTimeCam with " << GetNamePattern() << endl;
+  if (fIntensBlind)
+    {
+      fIntensBlind->AddToList(Form("MCalibrationBlindCam%s",GetNamePattern()),*fGeom);
+      *fLog << inf << "New MCalibrationBlindCam with " << GetNamePattern() << endl;
     }
 
@@ -357 +359 @@
     number[MCalibrationCam::kCT1]   += 1;
 
-  TString result;
+  TString result = "";
   
   for (Int_t i=0; i<MCalibrationCam::gkNumPulserColors; i++)