Changeset 4793 for trunk/MagicSoft/Mars

Timestamp:

08/29/04 17:04:39 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbadpixels/MBadPixelsCam.cc (modified) (2 diffs)
• mbadpixels/MBadPixelsPix.h (modified) (2 diffs)
• mcalib/MCalibrationChargeCalc.cc (modified) (2 diffs)
• mcalib/MHCalibrationCam.cc (modified) (1 diff)
• mcalib/MHCalibrationCam.h (modified) (1 diff)
• mcalib/MHCalibrationChargeCam.cc (modified) (13 diffs)
• mcalib/MHCalibrationChargeCam.h (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -616 +616 @@
 // 21: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kRelTimeOscillating  )
 // 22: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kDeviatingNumPhots   )
+// 23: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kHiGainOverFlow      )
+// 24: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kLoGainOverFlow      )
 //
 Bool_t MBadPixelsCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
@@ -739 +741 @@
       val = 1;
       break;
+    case 23:
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOverFlow    ))
+        return kFALSE;
+      val = 1;
+      break;
+    case 24:
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOverFlow   ))
+        return kFALSE;
+      val = 1;
+      break;
     default:
       return kFALSE;

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -90 +90 @@
 
     Int_t  GetUnsuitableCalibration() const   {
-      if (!IsUnsuitable()) return 0;
+      if (!IsUnsuitable())                        return 0;
       if (IsUncalibrated( kChargeIsPedestal    )) return 1;
       if (IsUncalibrated( kChargeRelErrNotValid)) return 2;
@@ -105 +105 @@
     
     Int_t  GetUnreliableCalibration() const   {
-      if (!IsUnreliable()) return 0;
+      if (!IsUnreliable() || IsUnsuitable())      return 0;
       if (IsUncalibrated( kChargeSigmaNotValid )) return 1;
       if (IsUncalibrated( kHiGainNotFitted     )) return 2;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -910 +910 @@
 // - MBadPixelsPix::kMeanTimeInLast2Bins 
 // - MBadPixelsPix::kDeviatingNumPhes
+// - MBadPixelsPix::kHiGainOverFlow
+// - MBadPixelsPix::kLoGainOverFlow
 //
 // - Call MCalibrationPix::SetExcluded() for the bad pixels
@@ -941 +943 @@
 
       if (bad.IsUncalibrated( MBadPixelsPix::kDeviatingNumPhes ))
+        bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
+
+      if (bad.IsUncalibrated( MBadPixelsPix::kHiGainOverFlow   ))
+        bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
+
+      if (bad.IsUncalibrated( MBadPixelsPix::kLoGainOverFlow   ))
         bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc

@@ -115 +115 @@
     SetPulserFrequency();
 
-    fHiGainOverFlow = 0;
-    fLoGainOverFlow = 0;
 }
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h

@@ -65 +65 @@
   TArrayI    fAverageSectorNum;          // Number of pixels in average pixels per sector 
   TArrayI    fRunNumbers;                // Numbers of runs used
-  UInt_t     fHiGainOverFlow;            // Number of times overflow occurred in whole run
-  UInt_t     fLoGainOverFlow;            // Number of times overflow occurred in whole run
+  TArrayI    fHiGainOverFlow;            // Number of times overflow occurred in whole run
+  TArrayI    fLoGainOverFlow;            // Number of times overflow occurred in whole run
 
   MCalibrationCam::PulserColor_t fColor; // Colour of the pulsed LEDs

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -154 +154 @@
 using namespace std;
 
+const Int_t   MHCalibrationChargeCam::fgAverageNbinsHiGain       = 3300;
+const Int_t   MHCalibrationChargeCam::fgAverageNbinsLoGain       = 1950;
 const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.01;
 const Float_t MHCalibrationChargeCam::fgNumLoGainSaturationLimit = 0.005;
@@ -175 +177 @@
 // - fTimeLowerLimit           to fgTimeLowerLimit 
 // - fTimeUpperLimit           to fgTimeUpperLimit 
+// - fAverageNbins             to fgAverageNbinsHiGain
 //
 MHCalibrationChargeCam::MHCalibrationChargeCam(const char *name, const char *title)
     : fRawEvt(NULL)
 {
+
   fName  = name  ? name  : "MHCalibrationChargeCam";
   fTitle = title ? title : "Class to fill the calibration histograms ";
@@ -187 +191 @@
   SetTimeUpperLimit();
 
-
+  SetAverageNbins(fgAverageNbinsHiGain);
 }
 
@@ -220 +224 @@
 // Initializes, if empty to MGeomCam::GetNumPixels():
 // - MHCalibrationCam::fHiGainArray, MHCalibrationCam::fLoGainArray
+// - MHCalibrationCam::fHiGainOverflow, MHCalibrationCam::fLoGainOverflow
 //
 // Initializes, if empty to MGeomCam::GetNumAreas() for:
@@ -243 +248 @@
 {
 
-  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
+  MExtractedSignalCam *signal = 
+    (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
   if (!signal)
   {
@@ -301 +307 @@
         InitHists((*this)[i],(*fBadPixels)[i],i);
       }
+      fHiGainOverFlow.Set(npixels);
   }
 
@@ -310 +317 @@
       {
           (*fLoGainArray)[i] = new MHCalibrationChargeLoGainPix;
-          InitHists((*this)(i),(*fBadPixels)[i],i);
+          MHGausEvents &lopix = (*this)(i);
+          //
+          // Adapt the range for the case, the intense blue is used:
+          // FIXME: this is a nasty workaround, but for the moment necessary 
+          // in order to avoid default memory space.
+          //
+          if (fGeom->InheritsFrom("MGeomCamMagic"))
+            {
+              if ( fColor == MCalibrationCam::kBLUE)
+                {
+                  lopix.SetLast(999.5);
+                  lopix.SetNbins(1150);
+                }
+            }
+          InitHists(lopix,(*fBadPixels)[i],i);
       }
-      
+      fLoGainOverFlow.Set(npixels);  
   }
 
@@ -357 +378 @@
 
         MHCalibrationChargePix &hist = (MHCalibrationChargePix&)GetAverageLoGainArea(j);
-
-        hist.SetNbins(fAverageNbins);
+        hist.SetNbins(fgAverageNbinsLoGain);
+
+        //
+        // Adapt the range for the case, the intense blue is used:
+        // FIXME: this is a nasty workaround, but for the moment necessary 
+        // in order to avoid default memory space.
+        //
+        if (fGeom->InheritsFrom("MGeomCamMagic"))
+            {
+              if ( fColor == MCalibrationCam::kBLUE)
+                {
+                  hist.SetFirst(-10.5);
+                  hist.SetLast(999.5);
+                  hist.SetNbins(3030);
+                }
+            }
+
         hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Area Idx ");
 
@@ -410 +446 @@
 
           hist.GetHGausHist()->SetTitle("Summed FADC slices average LoGain Sector ");
-          hist.SetNbins(fAverageNbins);
+          hist.SetNbins(fgAverageNbinsLoGain);
+          
+          //
+          // Adapt the range for the case, the intense blue is used:
+          // FIXME: this is a nasty workaround, but for the moment necessary 
+          // in order to avoid default memory space.
+          //
+          if (fGeom->InheritsFrom("MGeomCamMagic"))
+            {
+              if ( fColor == MCalibrationCam::kBLUE)
+                {
+                  hist.SetFirst(-10.5);
+                  hist.SetLast(999.5);
+                  hist.SetNbins(3030);
+                }
+            }
+          
           hist.GetHAbsTime()->SetTitle("Absolute Arrival Time average LoGain Sector ");
 
           InitHists(hist,fCam->GetAverageBadSector(j),j);
-          
       }
   }
@@ -494 +545 @@
 
       if (!histhi.FillHistAndArray(sumhi))
-        fHiGainOverFlow++;
+        fHiGainOverFlow[i]++;
+
       if (!histlo.FillHistAndArray(sumlo))
-        fLoGainOverFlow++;
-      
+        fLoGainOverFlow[i]++;
+
       const Int_t sathi = (Int_t)pix.GetNumHiGainSaturated();
       const Int_t satlo = (Int_t)pix.GetNumLoGainSaturated();
@@ -615 +667 @@
   *fLog << endl;
 
-  if (fHiGainOverFlow)
-    *fLog << warn << GetDescriptor()
-          << ": Histogram Overflow has occurred " << fHiGainOverFlow << " in the High-Gain! " << endl;
-  if (fLoGainOverFlow)
-    *fLog << warn << GetDescriptor()
-          << ": Histogram Overflow has occurred " << fLoGainOverFlow << " in the Low-Gain! " << endl;
-
   for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
     {
@@ -639 +684 @@
         }
 
+      if (fHiGainOverFlow[i])
+        {
+          *fLog << warn << GetDescriptor()
+                << ": Hi-Gain Histogram Overflow occurred " << fHiGainOverFlow[i] 
+                << " times in pixel: " << i << " (without saturation!) " << endl;
+          bad.SetUncalibrated( MBadPixelsPix::kHiGainOverFlow ); 
+        }
+      
       FinalizeAbsTimes(histhi, pix, bad, fFirstHiGain, fLastHiGain);
     }
@@ -659 +712 @@
         }
   
+      if (fLoGainOverFlow[i])
+        {
+          *fLog << warn << GetDescriptor()
+                << ": Lo-Gain Histogram Overflow occurred " << fLoGainOverFlow[i] 
+                << " times in pixel: " << i << " (without saturation!) " << endl;
+          bad.SetUncalibrated( MBadPixelsPix::kLoGainOverFlow ); 
+        }
+
       MCalibrationChargePix &pix    = (MCalibrationChargePix&)(*fCam)[i];
       

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h

@@ -18 +18 @@
 {
 private:
+
+  static const Int_t   fgAverageNbinsHiGain;         //! The default for fAverageNbins HiGain (now set to: 3300)
+  static const Int_t   fgAverageNbinsLoGain;         //! The default for fAverageNbins LoGain (now set to: 1950)  
 
   static const Float_t fgNumHiGainSaturationLimit;   //! The default for fNumHiGainSaturationLimit (now at: 0.01)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -282 +282 @@
     MHCamera disp23(geomcam, "Excluded",          "Pixels previously excluded");
     MHCamera disp24(geomcam, "UnSuitable",        "Pixels not suited for further analysis");
-    MHCamera disp25(geomcam, "UnReliable",        "Pixels not reliable for further analysis");
+    MHCamera disp25(geomcam, "UnReliable",        "Pixels suitable, but not reliable for further analysis");
     MHCamera disp26(geomcam, "HiGainOscillating", "Oscillating Pixels High Gain");
     MHCamera disp27(geomcam, "LoGainOscillating", "Oscillating Pixels Low Gain");
@@ -778 +778 @@
       pave2->AddText("  ");
       TText *t3 = pave2->AddText(Form("Signal Sigma smaller Pedestal RMS:      %3i pixels",
-                                       CountBadPixels(&disp24,1)));
+                                       CountBadPixels(&disp25,1)));
       t3->SetTextColor(gStyle->GetColorPalette(Int_t(1./max*numcol + 1.)));
       t3->SetTextAlign(12);
@@ -801 +801 @@
       tt5->SetTextColor(gStyle->GetColorPalette(Int_t(6./max2*numcol + 1.)));
       tt5->SetTextAlign(12); 
-      TText *tt6 = pave2->AddText(Form("Relative Arr. Times Oscillation:              %3i pixels",
+      TText *tt6 = pave2->AddText(Form("Relative Arr. Times Oscillation:               %3i pixels",
                                        CountBadPixels(&disp25,7)));
       tt6->SetTextColor(gStyle->GetColorPalette(Int_t(7./max2*numcol + 1.)));