Changeset 3180 for trunk/MagicSoft

Timestamp:

02/16/04 10:58:17 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCalc.cc (modified) (1 diff)
• mcalib/MHCalibrationRelTimeCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -15 +15 @@
      - filled from MArrivalTime 
      - need: MFillH("MHCalibrationRelTimeCam","MArrivalTime")
+
+   * manalysis/MCalibrationCalc.cc
+     - take out all uncommented code referring to the relative arrival time
 
    * manalysis/MArrivalTime.h 

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -408 +408 @@
 
       Float_t abstime = 0.;
-#if 0
-      Float_t reltime = 0.;
-
-      if (TESTBIT(fFlags,kUseTimes))
-        {
-
-          //
-          // Have a look in MArrivalTime, 
-          // otherwise search the position of maximum bin 
-          // in MRawEvtData
-          //
-          if (fArrivalTime)
-            {
-              abstime = (*fArrivalTime)[pixid];
-              reltime = abstime - (*fArrivalTime)[1];
-            }
-          
-          else
-            {
-              if (pixid == 1)
-                referencetime = (Float_t)pixel.GetIdxMaxHiGainSample();
-              if (sig.IsLoGainUsed())
-                {
-                  abstime = (Float_t)pixel.GetIdxMaxLoGainSample();
-                  //            reltime = abstime - referencetime;
-                }
-              else
-                {
-                  abstime = (Float_t)pixel.GetIdxMaxHiGainSample();
-                  //                  reltime = abstime - referencetime;
-                }
-              //            }
-              //        }  /* if Use Times */
-
-#endif
+      if (sig.IsLoGainUsed())
+        abstime = (Float_t)pixel.GetIdxMaxLoGainSample();
+      else
+        abstime = (Float_t)pixel.GetIdxMaxHiGainSample();
+
       switch(pixid)
         {

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

@@ -187 +187 @@
 Bool_t MHCalibrationRelTimeCam::Finalize()
 {
-    for (Int_t i=0; i<fArray->GetSize(); i++)
-    {
-
-        MHCalibrationRelTimePix &hist = (*this)[i];
-
-        //
-        // 1) Return if the charge distribution is already succesfully fitted
-        //    or if the histogram is empty
-        //
-        if (hist.IsGausFitOK() || hist.IsEmpty())
-          continue;
-
-        //
-        // 2) Fit the Hi Gain histograms with a Gaussian
-        //
-        hist.FitGaus();
-        
-        //
-        // 3) If fit does not succeed , bypass the fit and take the histogram means and sigmas
-        //
-        if (!hist.IsGausFitOK())
-          hist.BypassFit();
-
-        //
-        // 4) Create the fourier transform of the arrays 
-        //
-        hist.CreateFourierSpectrum();
-
-        //
-        // 5) Renormalize to the real time in ns.
-        //
-        hist.Renorm(fTimeSliceWidth);
-
-    }
-    return kTRUE;
+
+  for (Int_t i=0; i<fArray->GetSize(); i++)
+    {
+      
+      MHCalibrationRelTimePix &hist = (*this)[i];
+      
+      //
+      // 1) Return if the charge distribution is already succesfully fitted
+      //    or if the histogram is empty
+      //
+      if (hist.IsGausFitOK() || hist.IsEmpty())
+        continue;
+      
+      //
+      // 2) Fit the Hi Gain histograms with a Gaussian
+      //
+      hist.FitGaus();
+      
+      //
+      // 3) If fit does not succeed , bypass the fit and take the histogram means and sigmas
+      //
+      if (!hist.IsGausFitOK())
+        hist.BypassFit();
+      
+      //
+      // 4) Create the fourier transform of the arrays 
+      //
+      hist.CreateFourierSpectrum();
+      
+      //
+      // 5) Renormalize to the real time in ns.
+      //
+      hist.Renorm(fTimeSliceWidth);
+      
+    }
+  return kTRUE;
 }