Changeset 1545 for trunk/MagicSoft/Mars

Timestamp:

10/16/02 20:34:41 (22 years ago)

Author:

bigongia

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCerPhotCalc.cc (modified) (10 diffs)
• manalysis/MCerPhotCalc2.cc (deleted)
• manalysis/MCerPhotCalc2.h (deleted)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/10/16: Abelardo Moralejo
+
+   * manalysis/MCerPhotCalc2.[h,cc], MCerPhotCalc.[h,cc]
+     - Class MCerPhotCalc2 renamed MCerPhotCalc (they were redundant).
+     - Now the default pixel treatment is the same as originally: add 
+       all FADC slices
+
  2002/10/16: Thomas Bretz
 

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Abelardo Moralejo 7/2002  (moralejo@pd.infn.it)
+!
+!   Copyright: MAGIC Software Development, 2002
 !
 !
@@ -25 +25 @@
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //
-//   MCerPhotCalc                                                           //
+//   MCerPhotCalc                                                          //
 //                                                                          //
 //   This is a task which calculates the number of photons from the FADC    //
-//   time slices. At the moment it integrates simply the FADC values.       //
+//   time slices. It weights the each slice according to the numbers in     //
+//   the array fWeight (default: all slices added up with weight 1). 
 //                                                                          //
 //  Input Containers:                                                       //
-//   MRawEvtData, MPedesdtalCam                                             //
+//   MRawRunHeader, MRawEvtData, MPedestalCam                               //
 //                                                                          //
 //  Output Containers:                                                      //
@@ -63 +64 @@
 {
     fName  = name  ? name  : "MCerPhotCalc";
-    fTitle = title ? title : "Task to calculate Cerenkov photons from raw data";
+    fTitle = title ? title : "Task to calculate pixel signal from raw data";
 
     AddToBranchList("MRawEvtData.fHiGainPixId");
@@ -70 +71 @@
     AddToBranchList("MRawEvtData.fLoGainFadcSamples");
 
+    SetDefaultWeights();
 }
 
@@ -99 +101 @@
     }
 
-    fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam");
+    fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
     if (!fPedestals)
     {
@@ -109 +111 @@
     if (!fCerPhotEvt)
         return kFALSE;
+
+    // Calculate quadratic sum of weights:
+    fSumQuadWeights = 0.;
+    for (Int_t i = 0; i < fWeight.GetSize(); i++)
+      fSumQuadWeights += fWeight[i]*fWeight[i];
+
+    fSumQuadWeights = sqrt(fSumQuadWeights);
 
     return kTRUE;
@@ -128 +137 @@
     }
 
+    if (fRunHeader->GetNumSamplesHiGain() != fWeight.GetSize())
+    {
+        *fLog << dbginf << "Number of FADC slices (" << fRunHeader->GetNumSamplesHiGain() <<") is different from assumed one (" << fWeight.GetSize() << ")... aborting." << endl;
+        return kFALSE;
+    }
+
     if (runheader->GetRunType() != kRTMonteCarlo)
         return kTRUE;
@@ -156 +171 @@
     MRawEvtPixelIter pixel(fRawEvt);
 
+    TArrayF BinSignal(fWeight.GetSize());
+
     while (pixel.Next())
-    {
+      {
         const UInt_t pixid = pixel.GetPixelId();
-
         const MPedestalPix &ped = (*fPedestals)[pixid];
 
@@ -171 +187 @@
         }
 
-        Float_t nphot = (Float_t)pixel.GetSumHiGainSamples();
-
-        //
-        // We check that the pixel is not empty, if it is empty
-        // we won't substract the pedestal. Empty means that it has
-        // 0 signal in all the slices.
-        //
+        // Mean pedestal:
         const Double_t mean = fEnableFix ? ped.GetMean()-0.5 : ped.GetMean();
-        if (nphot!=0)
-            nphot -= fRunHeader->GetNumSamplesHiGain()*mean;
-
-        fCerPhotEvt->AddPixel(pixid, nphot, sqrt(fRunHeader->GetNumSamplesHiGain())*ped.GetSigma());
+
+        Byte_t *ptr = pixel.GetHiGainSamples();
+
+        Float_t nphot = 0.;
+
+        for(Int_t i = 0; i<fWeight.GetSize(); i++)
+          {
+            BinSignal[i] =  (Float_t) ptr[i] - mean;
+            nphot       +=  BinSignal[i] * fWeight[i];
+          }
+
+        Float_t nphoterr = ped.GetSigma()* fSumQuadWeights;
+
+        fCerPhotEvt->AddPixel(pixid, nphot, nphoterr);
 
         // FIXME! Handling of Lo Gains is missing!
-    }
+      }
 
     fCerPhotEvt->SetReadyToSave();
@@ -191 +211 @@
     return kTRUE;
 }
+
+//
+// Set default values for the number of slices and weights:
+//
+
+void MCerPhotCalc::SetDefaultWeights()
+{
+  const Float_t dummy[15] = {1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.,};
+
+  fWeight.Set(15,dummy);
+  return;
+}
+
+
+
+