Changeset 5950

Timestamp:

01/23/05 17:36:07 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHCalibrationCam.cc (modified) (3 diffs)
• mhcalib/MHCalibrationChargeCam.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
     - updated to new logain switch setting in MExtractTimeAndCharge
     - extract also high-gain vs. low-gain time difference
+
+  * mhcalib/MHCalibrationCam.[h,cc]
+  * mhcalib/MHCalibrationChargeCam.[h,cc]
+    - updated reading of conf. values in ReadEnv
 
   * mhcalib/MCalibrationHiLoCam.[h,cc]

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -1215 +1215 @@
         bad.SetUncalibrated( fittyp );
       }
-  
+ 
   //
   // 4) Check for oscillations
@@ -1468 +1468 @@
       rc = kTRUE;
     }
+
   if (IsEnvDefined(env, prefix, "Last", print))
     {
@@ -1474 +1475 @@
     }
   
+  if (IsEnvDefined(env, prefix, "ProbLimit", print))
+    {
+      SetProbLimit(GetEnvValue(env, prefix, "ProbLimit", fProbLimit));
+      rc = kTRUE;
+    }
+  
+  if (IsEnvDefined(env, prefix, "OverflowLimit", print))
+    {
+      SetOverflowLimit(GetEnvValue(env, prefix, "OverflowLimit", fOverflowLimit));
+      rc = kTRUE;
+    }
+  
+  if (IsEnvDefined(env, prefix, "PulserFrequency", print))
+    {
+      SetPulserFrequency(GetEnvValue(env, prefix, "PulserFrequency", fPulserFrequency));
+      rc = kTRUE;
+    }
+  
   return rc;
 }

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -170 +170 @@
 const TString MHCalibrationChargeCam::gsAbsHistXTitle     = "Time [FADC slices]";
 const TString MHCalibrationChargeCam::gsAbsHistYTitle     = "Nr. events";
-const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.01;
+const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.02;
 const Float_t MHCalibrationChargeCam::fgNumLoGainSaturationLimit = 0.005;
 const Float_t MHCalibrationChargeCam::fgTimeLowerLimit           = 1.;
@@ -419 +419 @@
 {
   
+  MBadPixelsCam *badcam    = fIntensBad 
+    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
+
   TH1F *h;
 
@@ -442 +445 @@
         pix.SetAbsTimeLast(higainsamples-0.5);
 
-        InitHists(pix,fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i],i);
+        InitHists(pix,(*badcam)[i],i);
 
         h = pix.GetHAbsTime();
@@ -538 +541 @@
     return;
 
+
+  MBadPixelsCam *badcam    = fIntensBad 
+    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
+
+  badcam->Print();
+
   const Int_t logainsamples = fRunHeader->GetNumSamplesLoGain();
 
@@ -561 +570 @@
           pix.SetAbsTimeLast(logainsamples-0.5);
           
-          InitHists(pix,fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i],i);
+          InitHists(pix,(*badcam)[i],i);
 
           h = pix.GetHAbsTime();
@@ -862 +871 @@
   MBadPixelsCam   *badcam    = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
 
+
   for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
     {
@@ -868 +878 @@
       
       if (histhi.IsExcluded())
-        continue;
-      
+        continue;
+
       MCalibrationChargePix  &pix = (MCalibrationChargePix&)(*chargecam)[i] ;
 
@@ -913 +923 @@
         
         if (histlo.IsExcluded())
-          continue;
-        
+          continue;
+
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
           {
@@ -1409 +1419 @@
   if (MHCalibrationCam::ReadEnv(env,prefix,print))
     rc = kTRUE;
+   
+  if (IsEnvDefined(env, prefix, "HiGainNbins", print))
+    {
+      SetNbins(GetEnvValue(env, prefix, "HiGainNbins", fNbins));
+      rc = kTRUE;
+    }
+  
+  if (IsEnvDefined(env, prefix, "HiGainFirst", print))
+    {
+      SetFirst(GetEnvValue(env, prefix, "HiGainFirst", fFirst));
+      rc = kTRUE;
+    }
+  
+  if (IsEnvDefined(env, prefix, "HiGainLast", print))
+    {
+      SetLast(GetEnvValue(env, prefix, "HiGainLast", fLast));
+      rc = kTRUE;
+    }
   
   if (IsEnvDefined(env, prefix, "LoGainNbins", print))
@@ -1439 +1467 @@
       rc = kTRUE;
     }
-  
-  
+   
+ 
   return rc;
 }