Changeset 3832 for trunk/MagicSoft/Mars/macros/calibration.C

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/macros/calibration.C (modified) (5 diffs)

trunk/MagicSoft/Mars/macros/calibration.C

@@ -52 +52 @@
 // 
 /////////////////////////////////////////////////////////////////////////////
-const TString inpath = "/home/rootdata/BlindPixel/";
-const Int_t pedrun  = 20491;
-const Int_t calrun1 = 20494;
-const Int_t calrun2 = 20496;
+const TString inpath = "/home/rootdata/Calib/2004_04_16/";
+const Int_t pedrun  = 22265;
+const Int_t calrun1 = 22299;
+const Int_t calrun2 = 22300;
 
 void calibration(const Int_t prun=pedrun, const Int_t crun1=calrun1, const Int_t crun2=calrun2)
@@ -70 +70 @@
     cruns.AddRuns(crun1,crun2,inpath);
 
-  MCalibrationCam::PulserColor_t color;
-
-  if (crun1 < 20000)
-    color = MCalibrationCam::kCT1;
-  else
-    color = FindColor((MDirIter*)&cruns);
-
-  if (color == MCalibrationCam::kNONE)
-    return;
-
   MCalibrationQECam qecam;
   MBadPixelsCam     badcam;
@@ -88 +78 @@
   //
   //  badcam.AsciiRead("badpixels.dat");
-
-  for (Int_t i=0;i<badcam.GetSize();i++)
-    if (badcam[i].IsBad())
-      cout << "Bad Pixel: " << i << endl;
 
   MStatusDisplay *display = new MStatusDisplay;
@@ -114 +100 @@
   //
   MJCalibration calloop;
-  calloop.SetColor(color);
+  //  calloop.SetColor(color);
 
   //
@@ -136 +122 @@
 }
 
-MCalibrationCam::PulserColor_t FindColor(MDirIter* run) 
-{
-  
-  MCalibrationCam::PulserColor_t col = MCalibrationCam::kNONE;
-
-  TString filenames;
-
-  while (!(filenames=run->Next()).IsNull())
-    {
-
-      filenames.ToLower();
-
-      if (filenames.Contains("green"))
-        if (col == MCalibrationCam::kNONE)
-          {
-            cout << "Found colour: Green  in " << filenames << endl;
-            col = MCalibrationCam::kGREEN;
-          }
-        else if (col != MCalibrationCam::kGREEN)
-          {
-            cout << "Different colour found in " << filenames << "... abort" << endl;
-            return MCalibrationCam::kNONE;
-          }
-
-      if (filenames.Contains("blue"))
-        if (col == MCalibrationCam::kNONE)
-          {
-            cout << "Found colour: Blue  in " << filenames << endl;
-            col = MCalibrationCam::kBLUE;
-          }
-        else if (col != MCalibrationCam::kBLUE)
-          {
-            cout << "Different colour found in " << filenames << "... abort" << endl;
-            return MCalibrationCam::kNONE;
-          }
-
-      if (filenames.Contains("uv"))
-        if (col == MCalibrationCam::kNONE)
-          {
-            cout << "Found colour: Uv  in " << filenames << endl;
-            col = MCalibrationCam::kUV;
-          }
-        else if (col != MCalibrationCam::kUV)
-          {
-            cout << "Different colour found in " << filenames << "... abort" << endl;
-            return MCalibrationCam::kNONE;
-          }
-
-      if (filenames.Contains("ct1"))
-        if (col == MCalibrationCam::kNONE)
-          {
-            cout << "Found colour: Ct1  in " << filenames << endl;
-            col = MCalibrationCam::kCT1;
-          }
-        else if (col != MCalibrationCam::kCT1)
-          {
-            cout << "Different colour found in " << filenames << "... abort" << endl;
-            return MCalibrationCam::kNONE;
-          }
-      
-    }
-  
-
-      
-  if (col == MCalibrationCam::kNONE)
-    cout <<  "No colour found in filenames of runs: " << ((MRunIter*)run)->GetRunsAsString() 
-         << "... abort" << endl;
-  
-  return col;      
-}