Changeset 3721 for trunk

Timestamp:

04/13/04 18:21:31 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationChargeCam.cc (modified) (17 diffs)
• mcalib/MHCalibrationChargeCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -45 +45 @@
    * msignal/MExtractedSignalCam.cc
      - intialize variables by default to 0. 
+
+   * mcalib/MHCalibrationChargeCam.[h,cc]
+     - pointer to fSig is not stored, somehow, when running MJCalibration
+       Don't know why. Removed and stored some variables instead
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -160 +160 @@
 //
 MHCalibrationChargeCam::MHCalibrationChargeCam(const char *name, const char *title)
-    : fRawEvt(NULL), fSig(NULL)
+    : fRawEvt(NULL)
 {
   fName  = name  ? name  : "MHCalibrationChargeCam";
@@ -175 +175 @@
 // Gets the pointers to:
 // - MRawEvtData
-// - MExtractedSignalCam
 //
 Bool_t MHCalibrationChargeCam::SetupHists(const MParList *pList)
 {
-  
+
   fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
   if (!fRawEvt)
@@ -187 +186 @@
   }
 
-  MExtractedSignalCam *fSig = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
-  if (!fSig)
-  {
-      *fLog << err << "MExtractedSignalCam not found... abort." << endl;
-      return kFALSE;
-  }
-
   return kTRUE;
 }
@@ -200 +192 @@
 //
 // Gets or creates the pointers to:
+// - MExtractedSignalCam
 // - MCalibrationChargeCam
 // - MBadPixelsCam
@@ -231 +224 @@
 {
 
+  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
+  if (!signal)
+  {
+      *fLog << err << "MExtractedSignalCam not found... abort." << endl;
+      return kFALSE;
+  }
+
   fCam = (MCalibrationCam*)pList->FindObject("MCalibrationChargeCam");
   if (!fCam)
@@ -244 +244 @@
     }
 
-  const Float_t numhigain = fSig->GetNumUsedHiGainFADCSlices();
-  const Float_t numlogain = fSig->GetNumUsedLoGainFADCSlices();  
+  fFirstHiGain = signal->GetFirstUsedSliceHiGain();
+  fLastHiGain  = signal->GetLastUsedSliceHiGain();
+  fFirstLoGain = signal->GetFirstUsedSliceLoGain();
+  fLastLoGain  = signal->GetLastUsedSliceLoGain();
+
+  const Float_t numhigain = signal->GetNumUsedHiGainFADCSlices();
+  const Float_t numlogain = signal->GetNumUsedLoGainFADCSlices();  
 
   if (fCam->GetNumHiGainFADCSlices() == 0.)
@@ -252 +257 @@
     {
       *fLog << err << GetDescriptor() 
-            << ": Number of High Gain FADC extraction slices has changes, abort..." << endl;
+            << ": Number of High Gain FADC extraction slices has changed, abort..." << endl;
       return kFALSE;
     }
-  
+
   if (fCam->GetNumLoGainFADCSlices() == 0.)
     fCam->SetNumLoGainFADCSlices ( numlogain );
@@ -310 +315 @@
       }
   }
+
 
   if (fAverageLoGainAreas->GetEntries()==0)
@@ -561 +567 @@
 {
 
-  const Byte_t firsthi = fSig->GetFirstUsedSliceHiGain();
-  const Byte_t lasthi  = fSig->GetLastUsedSliceHiGain();
-  const Byte_t firstlo = fSig->GetFirstUsedSliceLoGain();
-  const Byte_t lastlo  = fSig->GetLastUsedSliceLoGain();
-
-
   for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
     {
@@ -584 +584 @@
         }
 
-      FinalizeAbsTimes(histhi, pix, bad, firsthi, lasthi);
+      FinalizeAbsTimes(histhi, pix, bad, fFirstHiGain, fLastHiGain);
     }
 
@@ -607 +607 @@
       
       if (pix.IsHiGainSaturation())
-        FinalizeAbsTimes(histlo, pix, bad, firstlo, lastlo);
+        FinalizeAbsTimes(histlo, pix, bad, fFirstLoGain, fLastLoGain);
     }
 
@@ -624 +624 @@
         }
 
-      FinalizeAbsTimes(histhi, pix, bad, firsthi, lasthi);
+      FinalizeAbsTimes(histhi, pix, bad, fFirstHiGain, fLastHiGain);
    }
   
@@ -642 +642 @@
 
       if (pix.IsHiGainSaturation())
-        FinalizeAbsTimes(histlo, pix, bad, firstlo, lastlo);
+        FinalizeAbsTimes(histlo, pix, bad, fFirstLoGain, fLastLoGain);
     }
 
@@ -659 +659 @@
         }
 
-      FinalizeAbsTimes(histhi, pix, bad, firsthi, lasthi);
+      FinalizeAbsTimes(histhi, pix, bad, fFirstHiGain, fLastHiGain);
     }
   
@@ -678 +678 @@
 
       if (pix.IsHiGainSaturation())
-        FinalizeAbsTimes(histlo, pix, bad, firstlo, lastlo);
+        FinalizeAbsTimes(histlo, pix, bad, fFirstLoGain, fLastLoGain);
     }
   
@@ -721 +721 @@
     {
       *fLog << warn << GetDescriptor() 
-            << Form("%s%3.1f%s%2i%s%4i",": Mean ArrivalTime: ",mean," smaller than ",fTimeLowerLimit,
+            << Form("%s%3.1f%s%2.0f%s%4i",": Mean ArrivalTime: ",mean," smaller than ",fTimeLowerLimit,
                     " FADC slices from lower edge in pixel ",hist.GetPixId()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInFirstBin );
@@ -729 +729 @@
     {
       *fLog << warn << GetDescriptor() 
-            << Form("%s%3.1f%s%2i%s%4i",": Mean ArrivalTime: ",mean," greater than ",fTimeUpperLimit,
+            << Form("%s%3.1f%s%2.0f%s%4i",": Mean ArrivalTime: ",mean," greater than ",fTimeUpperLimit,
                     " FADC slices from upper edge in pixel ",hist.GetPixId()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInLast2Bins );

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h

@@ -23 +23 @@
   Float_t fTimeLowerLimit;            // Limit dist. to first signal slice (in units of FADC slices) 
   Float_t fTimeUpperLimit;            // Limit dist. to last signal slice  (in units of FADC slices) 
-
+  Byte_t  fFirstHiGain;               // First used slice High Gain 
+  Byte_t  fLastHiGain;                // Last used slice High Gain
+  Byte_t  fFirstLoGain;               // First used slice Low Gain
+  Byte_t  fLastLoGain;                // Last used slice Low Gain
+  
   MRawEvtData         *fRawEvt;       //!  Raw event data 
-  MExtractedSignalCam *fSig;          //!  Signal Extractor
 
   Bool_t SetupHists(const MParList *pList);