Changeset 5064 for trunk

Timestamp:

09/16/04 12:02:45 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MTask.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (4 diffs)
• mjobs/MJCalibration.h (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (2 diffs)
• mjobs/MJob.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -33 +33 @@
    * mbase/MTime.h:
      - added IsMidnight
+
+   * mbase/MTask.cc:
+     - changed setw(3) to Form %5.1f
+
+   * mjobs/MJCalibration.[h,cc]:
+     - set default to 'nice' data-check display
+     - removed obsolete FindColor
+
+   * mjobs/MJPedestal.cc:
+     - enhanced output
+
+   * mjobs/MJob.cc:
+     - small changes to output
 
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -492 +492 @@
 {
     *fLog << " " << setw(7) << n << " (";
-    *fLog << setw(3) << TMath::Nint(100.*n/GetNumExecutions());
+    *fLog << Form("5.1f", 100.*n/GetNumExecutions());
     *fLog << "%) Evts skipped: " << str << endl;
 }

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -200 +200 @@
 MJCalibration::MJCalibration(const char *name, const char *title) 
     : fRuns(0), fExtractor(NULL), fTimeExtractor(NULL),
-      fColor(MCalibrationCam::kNONE), fDisplayType(kNormalDisplay),
+      fColor(MCalibrationCam::kNONE), fDisplayType(kDataCheckDisplay),
       fGeometry("MGeomCamMagic")
 {
@@ -1294 +1294 @@
 }
 
-
-// --------------------------------------------------------------------------
-//
-// 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() 
-{
-    if (fColor != MCalibrationCam::kNONE)
-      return kTRUE;
-
-    if (fSequence.IsValid())
-    {
-        fColor = MCalibrationCam::kCT1;
-        return kTRUE;
-    }
-
-    const UInt_t nruns = fRuns->GetNumRuns();
-    if (nruns == 0)
-        return kFALSE;
-
-    fRuns->Reset();
-
-    TString filenames;
-    while (!(filenames=((MDirIter*)fRuns)->Next()).IsNull())
-    {
-        MCalibrationCam::PulserColor_t newcolor = MCalibrationCam::kNONE;
-
-        TString number = filenames(TRegexp("[0-9]+_._.+[.]root$"));
-        Int_t num = atoi(number.Data());
-
-        if (num<gkIFAEBoxInaugurationRun)
-            newcolor = MCalibrationCam::kCT1;
-
-        switch (num)
-        {
-        case 26402:
-        case 22246:
-        case 22253:
-            newcolor = MCalibrationCam::kBLUE;
-            break;
-
-        case 30090:
-        case 20660:
-        case 20661:
-        case 26408:
-        case 26409:
-        case 26412:
-        case 26568:
-        case 26924:
-            newcolor = MCalibrationCam::kGREEN;
-            break;
-
-        case 27474:
-            newcolor = MCalibrationCam::kNONE;
-            *fLog << "Sorry, run 27474 was taken with CLOSED LIDS. It should not be used! " << endl;
-            return kFALSE;
-
-        default:
-            if (filenames.Contains("green",TString::kIgnoreCase))
-                newcolor = MCalibrationCam::kGREEN;
-            if (filenames.Contains("blue",TString::kIgnoreCase))
-                newcolor = MCalibrationCam::kBLUE;
-            if (filenames.Contains("uv",TString::kIgnoreCase))
-                newcolor = MCalibrationCam::kUV;
-            if (filenames.Contains("ct1",TString::kIgnoreCase))
-                newcolor = MCalibrationCam::kCT1;
-        }
-
-        if (newcolor==MCalibrationCam::kNONE)
-        {
-            *fLog << err << "No color found for " << filenames << "... abort." << endl;
-            return kFALSE;
-        }
-
-        if (fColor == MCalibrationCam::kNONE)
-            fColor = newcolor;
-
-        if (fColor != newcolor)
-        {
-            *fLog << err << "Color mismatch found in " << filenames << "... abort." << endl;
-            return kFALSE;
-        }
-    }
-
-    *fLog << inf << "Found color: ";
-    switch (fColor)
-    {
-    case MCalibrationCam::kBLUE:  *fLog << "kBLUE";  break;
-    case MCalibrationCam::kGREEN: *fLog << "kGREEN"; break;
-    case MCalibrationCam::kUV:    *fLog << "kUV";    break;
-    case MCalibrationCam::kCT1:   *fLog << "kCT1";   break;
-    default:                      *fLog << "<none>"; break;
-    }
-    *fLog << endl;
-
-    if (fColor!=MCalibrationCam::kNONE)
-        return kTRUE;
-
-    *fLog <<  "No colour found in: " << fRuns->GetRunsAsString() << "... abort." << endl;
-    return kFALSE;
-}
-
 // --------------------------------------------------------------------------
 //
@@ -1439 +1334 @@
 Bool_t MJCalibration::CheckEnvLocal()
 {
-    TString col = GetEnv("Color", "");
-    if (!col.IsNull())
-    {
-    }
-
     TString dis = GetEnv("Display", "");
     if (dis.BeginsWith("Full", TString::kIgnoreCase))
@@ -1592 +1482 @@
     fLog->Separator(GetDescriptor());
 
-    //    if (!FindColor())
-    //        return kFALSE;
-
     *fLog << "Calculate MCalibrationCam from ";
     if (fSequence.IsValid())

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -135 +135 @@
   
   // WORKAROUNDS!!!
-  Bool_t FindColor();
   void   InitBlindPixel(MExtractBlindPixel &blindext,
                         MHCalibrationChargeBlindCam &blindcam);

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -547 +547 @@
     // --------------------------------------------------------------------------------
 
+    const TString type = fUseData ? "data" : "pedestal";
+
     *fLog << inf;
     fLog->Separator(GetDescriptor());
-    *fLog << "Calculate MPedestalCam from Runs ";
+    *fLog << "Calculate MPedestalCam from " << type << "-runs ";
     if (fSequence.IsValid())
         *fLog << fSequence.GetName() << endl;
@@ -572 +574 @@
     if (fSequence.IsValid())
     {
-        const TString type = fUseData ? "data" : "pedestal";
         const Int_t n0 = fUseData ? fSequence.SetupDatRuns(iter, fPathData) : fSequence.SetupPedRuns(iter, fPathData);
         const Int_t n1 = fUseData ? fSequence.GetNumDatRuns() : fSequence.GetNumPedRuns();

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -186 +186 @@
     {
         *fLog << inf << " - Writing " << o->GetDescriptor() << "..." << flush;
-        if (o->Write()<=0)
+        if (o->Write(o->GetName())<=0)
         {
             *fLog << err << dbginf << "ERROR - Writing " << o->GetDescriptor() << " to file " << gFile->GetName() << endl;
             return kFALSE;
         }
-        *fLog << "done." << endl;
+        *fLog << "ok." << endl;
     }
     return kTRUE;
@@ -214 +214 @@
             return kFALSE;
         }
-        *fLog << "done." << endl;
+        *fLog << "ok." << endl;
     }
     return kTRUE;