Changeset 3734 for trunk/MagicSoft/Mars/mbadpixels

Timestamp:

04/14/04 16:35:59 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

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

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -53 +53 @@
 {
     fName  = name  ? name  : "MBadPixelsCam";
-    fTitle = title ? title : "";
+    fTitle = title ? title : "Storage container to store bad pixel information";
 
     fArray = new TClonesArray("MBadPixelsPix", 1);
+}
+
+MBadPixelsCam::MBadPixelsCam(const MBadPixelsCam &cam)
+{
+    fName  = "MBadPixelsCam";
+    fTitle = "Storage container to store bad pixel information";
+
+    fArray = new TClonesArray("MBadPixelsPix", 1);
+    cam.Copy(*fArray);
 }
 
@@ -342 +351 @@
       val = (*this)[idx].GetInfo()[0];
       return (*this)[idx].IsOK();
-      break;
     case 1:
       val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun);
       return val;
-      break;
     case 2:
       val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableEvt);
       return val;
-      break;
     case 3:
       val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnreliableRun);
       return val;
-      break;
     case 4:
       val = (*this)[idx].IsHiGainBad();
       return val;
-      break;
     case 5:
       val = (*this)[idx].IsLoGainBad();
       return val;
-      break;
     case 6:
       val = !(*this)[idx].IsCalibrationSignalOK();
       return val;
-      break;
     case 7:
       val = !(*this)[idx].IsCalibrationResultOK(); 
       return val;
-      break;
     case 8:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted);
       return val;
-      break;
     case 9:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainNotFitted);
       return val;
-      break;
     case 10:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOscillating);
       return val;
-      break;
     case 11:
      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOscillating);
       return val;
-      break;
     case 12:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainSaturation );
       return val;
-      break;
     case 13:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeIsPedestal );
       return val;
-      break;
     case 14:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeErrNotValid);
       return val;
-      break;
     case 15:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeRelErrNotValid);
       return val;
-      break;
     case 16:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid );
       return val;
-      break;
     case 17:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin  );
       return val;
-      break;
     case 18:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins );
       return val;
-      break;
     case 19:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kDeviatingNumPhes    );
       return val;
-      break;
     case 20:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeNotFitted );
       return val;
-      break;
     case 21:
       val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeOscillating  );
       return val;
-      break;
     default:
       return kFALSE;

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.h

@@ -19 +19 @@
 public:
     MBadPixelsCam(const char *name=NULL, const char *title=NULL);
+    MBadPixelsCam(const MBadPixelsCam &cam);
     ~MBadPixelsCam();
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsMerge.cc

@@ -26 +26 @@
 //
 //  MBadPixelsMerge
+//  ===============
 //
 //  Merges in ReInit two bad pixel containers together:
@@ -33 +34 @@
 //      into the container given in the constructor. While the contents
 //      to which 1) refers are still untouched.
+//
+//
+// An explanation taken from Mantis:
+// --------------------------------
+// In my eyes everything works a supposed to do. We have different sources
+// for bad-pixels, eg from Pedestal calculation, from the calibration
+// constant calculation, manual setting and so on. If processing data we
+// have to take care of all this different sources. Therefor we have to
+// store the bad pixels from this sources (eg. from calibration). In
+// addition MBadPixelsCam is read from the file containing the data (once
+// per file). Now always after a new (data-)file has been opened the bad
+// pixels from (for example) the calibration file have to be merged into
+// the container loaded from the (data-)file which is stored in the
+// parameter list. Copying the pointer would totally overwrite the pixels
+// loaded (automatically by MReadMarsFile) from the data-file. All this is
+// done using a copy of the original MBadPixelsCam (fSource). In addition
+// fDest is initialized to the pointer given as argument to the
+// constructor. To keep track of all bad pixels the instance this pointer
+// is pointing to is used to collect all bad pixels used so far.
+//
 //
 //  Input Containers:
@@ -69 +90 @@
     fTitle = title ? title : fgDefTitle.Data();
 
-    fSource = new MBadPixelsCam;
-    bad->Copy(*fSource);
+    fSource = new MBadPixelsCam(*bad);
 }