Changeset 4885 for trunk/MagicSoft/Mars

Timestamp:

09/07/04 13:44:17 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationChargeBlindPix.cc (modified) (1 diff)
• mcalib/MHCalibrationChargePINDiode.cc (modified) (1 diff)
• mcalib/MHCalibrationRelTimeCam.cc (modified) (12 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -53 +53 @@
    * mcalib/MHCalibrationCam.[h,cc]
    * mcalib/MHCalibrationChargeCam.cc
+   * mcalib/MHCalibrationRelTimeCam.cc
      - added bool kLoGain which is set if number of LoGain Slices in 
        MRawRunHeader is not 0. This excludes the low gain calculations 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc

@@ -1072 +1072 @@
   }
 
-  if (!IsEmpty() && !IsOnlyOverflow())
+  if (!IsEmpty() && !IsOnlyOverflow() && !IsOnlyUnderflow())
     gPad->SetLogy();
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc

@@ -375 +375 @@
     return;
 
-  if (!IsOnlyOverflow())
+  if (!IsOnlyOverflow() && !IsOnlyUnderflow())
     gPad->SetLogy();
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

@@ -200 +200 @@
   }
   
-  if (fLoGainArray->GetEntries()==0)
+  if (fLoGainArray->GetEntries()==0 && fLoGain )
   {
       fLoGainArray->Expand(npixels);
@@ -229 +229 @@
   }
 
-  if (fAverageLoGainAreas->GetEntries()==0)
+  if (fAverageLoGainAreas->GetEntries()==0 && fLoGain )
   {
     fAverageLoGainAreas->Expand(nareas);
@@ -263 +263 @@
   }
   
-  if (fAverageLoGainSectors->GetEntries()==0)
+  if (fAverageLoGainSectors->GetEntries()==0 && fLoGain )
     {
       fAverageLoGainSectors->Expand(nsectors);
@@ -348 +348 @@
       const Int_t sector = (*fGeom)[i].GetSector();
 
-      if (pix.IsLoGainUsed())
+      if (pix.IsLoGainUsed() && fLoGain)
         { 
           const Float_t reltime = pix.GetArrivalTimeLoGain() - reftime;
@@ -361 +361 @@
         {
           const Float_t reltime = pix.GetArrivalTimeHiGain() - reftime;
+
           histhi.FillHistAndArray(reltime) ;
           fSumareahi  [aidx]   += reltime;
@@ -374 +375 @@
       histhi.FillHistAndArray(fNumareahi[j] == 0 ? 0. : fSumareahi[j]/fNumareahi[j]);
 
-      MHGausEvents &histlo = GetAverageLoGainArea(j);
-      histlo.FillHistAndArray(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
+      if (fLoGain)
+        {
+          MHGausEvents &histlo = GetAverageLoGainArea(j);
+          histlo.FillHistAndArray(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
+        }
     }
   
@@ -383 +387 @@
       histhi.FillHistAndArray(fNumsectorhi[j] == 0 ? 0. : fSumsectorhi[j]/fNumsectorhi[j]);
 
-      MHGausEvents &histlo = GetAverageLoGainSector(j);
-      histlo.FillHistAndArray(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
+      if (fLoGain)
+        {
+          MHGausEvents &histlo = GetAverageLoGainSector(j);
+          histlo.FillHistAndArray(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
+        }
     }
 
@@ -414 +421 @@
         }
       else
-        (*this)(i).SetExcluded();
-      
-    }
-  
+        if (fLoGain)
+          (*this)(i).SetExcluded();
+      
+    }
+
+
   for (Int_t j=0; j<fAverageHiGainAreas->GetSize(); j++)
     {
@@ -429 +438 @@
         }
       else
-        GetAverageLoGainArea(j).SetExcluded();
+        if (fLoGain)
+          GetAverageLoGainArea(j).SetExcluded();
 
    }
@@ -444 +454 @@
         }
       else
-        GetAverageHiGainSector(j).SetExcluded();
-    }
-
+        if (fLoGain)        
+          GetAverageLoGainSector(j).SetExcluded();
+    }
 
   FitHiGainArrays((*fCam),*fBadPixels,
                   MBadPixelsPix::kRelTimeNotFitted,
                   MBadPixelsPix::kRelTimeOscillating);
-
-  FitLoGainArrays((*fCam),*fBadPixels,
-                  MBadPixelsPix::kRelTimeNotFitted,
-                  MBadPixelsPix::kRelTimeOscillating);
+  
+  if (fLoGain)        
+    FitLoGainArrays((*fCam),*fBadPixels,
+                    MBadPixelsPix::kRelTimeNotFitted,
+                    MBadPixelsPix::kRelTimeOscillating);
 
   return kTRUE;
@@ -489 +500 @@
 // ============== 
 //
-// 0: Fitted Mean Relative Arrival Time in ns  (MHGausEvents::GetMean()*MHCalibrationRelTimePix::GetFADCSliceWidth())
-// 1: Error Mean Relative Arrival Time in ns   (MHGausEvents::GetMeanErr()*MHCalibrationRelTimePix::GetFADCSliceWidth())
-// 2: Sigma fitted Relative Arrival Time in ns (MHGausEvents::GetSigma()*MHCalibrationRelTimePix::GetFADCSliceWidth())
-// 3: Error Sigma Relative Arrival Time in ns  (MHGausEvents::GetSigmaErr()*MHCalibrationRelTimePix::GetFADCSliceWidth())
+// 0: Fitted Mean Relative Arrival Time in FADC slices  (MHGausEvents::GetMean()*MHCalibrationRelTimePix::GetFADCSliceWidth())
+// 1: Error Mean Relative Arrival Time in FADC slices   (MHGausEvents::GetMeanErr()*MHCalibrationRelTimePix::GetFADCSliceWidth())
+// 2: Sigma fitted Relative Arrival Time in FADC slices (MHGausEvents::GetSigma()*MHCalibrationRelTimePix::GetFADCSliceWidth())
+// 3: Error Sigma Relative Arrival Time in FADC slices  (MHGausEvents::GetSigmaErr()*MHCalibrationRelTimePix::GetFADCSliceWidth())
 //
 // Useful variables derived from the fit results:
@@ -512 +523 @@
 
   const MHCalibrationRelTimePix &pix = (MHCalibrationRelTimePix&)(*this)[idx];
-  const Float_t fadc2ns              = pix.GetFADCSliceWidth();
 
   switch (type)
     {
     case 0:
-      val = pix.GetMean()*fadc2ns;
+      val = pix.GetMean();
       break;
     case 1:
-      val = pix.GetMeanErr()*fadc2ns;
+      val = pix.GetMeanErr();
       break;
     case 2:
-      val = pix.GetSigma()*fadc2ns;
+      val = pix.GetSigma();
       break;
     case 3:
-      val = pix.GetSigmaErr()*fadc2ns;
+      val = pix.GetSigmaErr();
       break;
     case 4: