Changeset 3477 for trunk/MagicSoft/Mars

Timestamp:

03/11/04 16:56:05 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

• MBadPixelsCam.cc (modified) (3 diffs)
• MBadPixelsPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -160 +160 @@
 void MBadPixelsCam::Print(Option_t *o) const
 {
-
     *fLog << all << GetDescriptor() << ":" << endl;
     
-    *fLog << all << "Pixels without problems:" << endl;
-    *fLog << all << endl;
+    *fLog << "Pixels without problems:" << endl;
+    *fLog << endl;
 
     Int_t count = 0;
 
     for (Int_t i=0; i<GetSize(); i++)
-      {
-        if ((*this)[i].IsSuitableRun())
-          {
+    {
+        if (!(*this)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+        {
             *fLog << i << " ";
             count ++;
-          }
+        }
 
         if (count == 0)
-          continue;
+            continue;
 
         if (!(count % 25))
-          *fLog << endl;
-      }
-    *fLog << endl;
-    *fLog << all << count << " normal pixels :-))" << endl;    
+            *fLog << endl;
+    }
+    *fLog << endl;
+    *fLog << count << " normal pixels :-))" << endl;
     *fLog << endl;
     count = 0;
 
 
-    *fLog << all << "Pixels unsuited for the whole run:" << endl;
-    *fLog << all << endl;
+    *fLog << "Pixels unsuited for the whole run:" << endl;
+    *fLog << endl;
 
     for (Int_t i=0; i<GetSize(); i++)
-      {
-        if ((*this)[i].IsUnsuitableRun())
-          {
+    {
+        if ((*this)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+        {
             *fLog << i << " ";
             count ++;
-          }
+        }
 
         if (count == 0)
-          continue;
+            continue;
 
         if (!(count % 25))
-          *fLog << endl;
-      }
-    *fLog << endl;
-    *fLog << all << count << " unsuited pixels :-(" << endl;    
+            *fLog << endl;
+    }
+    *fLog << endl;
+    *fLog << count << " unsuited pixels :-(" << endl;
     *fLog << endl;
 
@@ -215 +214 @@
 
     for (Int_t i=0; i<GetSize(); i++)
-      {
-        if ((*this)[i].IsUnreliableRun())
-          {
+    {
+        if ((*this)[i].IsUnsuitable(MBadPixelsPix::kUnreliableRun))
+        {
             *fLog << i << " ";
             count ++;
-          }
-        
+        }
+
         if (count == 0)
-          continue;
+            continue;
 
         if (!(count % 25))
-          *fLog << endl;
-      }
-    *fLog << endl;
-    *fLog << all << count << " unreliable pixels :-(" << endl;    
+            *fLog << endl;
+    }
+    *fLog << endl;
+    *fLog << count << " unreliable pixels :-(" << endl;
     *fLog << endl;
 }
@@ -317 +316 @@
       break;
     case 1:
-      val = (*this)[idx].IsUnsuitableRun();
+      val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun);
       return val;
       break;
     case 2:
-      val = (*this)[idx].IsUnsuitableEvt();
+      val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableEvt);
       return val;
       break;
     case 3:
-      val = (*this)[idx].IsUnreliableRun();
+      val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnreliableRun);
       return val;
       break;

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -104 +104 @@
     Bool_t IsCalibrationOscillating() const  { return ( !IsHiGainSaturation() && IsHiGainOscillating()) 
                                                   || ( IsHiGainSaturation() && IsLoGainOscillating()) ; }
-    Bool_t IsCalibrationResultOK()    const  {  return IsSuitableRun()
-                                                  && IsCalibrationSignalOK()
-                                                  && !IsCalibrationOscillating()
-                                                  && IsCalibrationFitOK()
-                                                  && (   (!IsHiGainSaturation() && !IsHiGainBad())
+    Bool_t IsCalibrationResultOK()    const  {  return !IsUnsuitable(kUnsuitableRun) &&
+                                                        IsCalibrationSignalOK()
+                                                    && !IsCalibrationOscillating()
+                                                         && IsCalibrationFitOK()
+                                                   && (   (!IsHiGainSaturation() && !IsHiGainBad())
                                                        || (IsHiGainSaturation() && !IsLoGainBad()) ) ;}