Changeset 3899

Timestamp:

04/29/04 20:31:56 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationRelTimeCam.cc (modified) (6 diffs)
• msignal/MArrivalTimePix.cc (modified) (5 diffs)
• msignal/MArrivalTimePix.h (modified) (2 diffs)
• msignal/MExtractTimeSpline.cc (added)
• msignal/Makefile (modified) (1 diff)
• msignal/SignalLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -50 +50 @@
  2004/04/29: Markus Gaug
 
+   * msignal/MArrivalTimePix.[h,cc]
+     - removed flag fLoGainUsed which is not used at all
 
    * msignal/MTimeExtractor.[h,cc]

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

@@ -209 +209 @@
                                       "Average Relative Arrival Times High Gain Area Idx ");
 
-        GetAverageHiGainArea(j).GetHGausHist()->SetTitle("Relative Arrival Times HiGain Area Idx ");
+        GetAverageHiGainArea(j).GetHGausHist()->SetTitle("Rel. Arr. Times HiGain Area Idx ");
         GetAverageHiGainArea(j).SetNbins(fAverageNbins);
 
@@ -226 +226 @@
                                       "Average Relative Arrival Times Low Gain Area Idx ");
 
-        GetAverageLoGainArea(j).GetHGausHist()->SetTitle("Relative Arrival Times LoGain Area Idx ");
+        GetAverageLoGainArea(j).GetHGausHist()->SetTitle("Rel. Arr. Times LoGain Area Idx ");
         GetAverageLoGainArea(j).SetNbins(fAverageNbins);
 
@@ -243 +243 @@
                                         "Average Relative Arrival Times High Gain Sector ");
 
-          GetAverageHiGainSector(j).GetHGausHist()->SetTitle("Relative Arrival Times HiGain Sector ");
+          GetAverageHiGainSector(j).GetHGausHist()->SetTitle("Rel. Arr. Times HiGain Sector ");
           GetAverageHiGainSector(j).SetNbins(fAverageNbins);
 
@@ -260 +260 @@
                                         "Average Relative Arrival Times Low Gain Sector ");
 
-          GetAverageLoGainSector(j).GetHGausHist()->SetTitle("Relative Arrival Times LoGain Sector ");
+          GetAverageLoGainSector(j).GetHGausHist()->SetTitle("Rel. Arr. Times LoGain Sector ");
           GetAverageLoGainSector(j).SetNbins(fAverageNbins);
 
@@ -333 +333 @@
       if (pix.IsLoGainUsed())
         { 
+
           histlo.FillHistAndArray(reltime);
           sumarealo  [aidx]   += reltime;
@@ -341 +342 @@
       else
         {
+
           histhi.FillHistAndArray(reltime) ;
           sumareahi  [aidx]   += reltime;

trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc

@@ -57 +57 @@
     fArrivalTimeLoGain(gkSignalInitializer),
     fArrivalTimeLoGainError(gkSignalInitializer),
-    fIsLoGainUsed(kFALSE),
     fNumHiGainSaturated(0),
     fNumLoGainSaturated(0)
@@ -76 +75 @@
   fArrivalTimeLoGainError = gkSignalInitializer;
   
-  fIsLoGainUsed = kFALSE;
-
   fNumHiGainSaturated = 0;
   fNumLoGainSaturated = 0;
@@ -89 +86 @@
 
 void MArrivalTimePix::SetArrivalTime(Float_t sighi, Float_t sighierr,
-                                             Float_t siglo, Float_t sigloerr)   
+                                     Float_t siglo, Float_t sigloerr)   
 {
   fArrivalTimeHiGain = sighi;
@@ -105 +102 @@
 {
 
-  fIsLoGainUsed = sat; 
   fNumHiGainSaturated = higain; 
   fNumLoGainSaturated = logain;
@@ -114 +110 @@
     *fLog << " Signal: " << fArrivalTimeHiGain
         << " +- " << fArrivalTimeHiGainError
-        << " LoGain? " << fIsLoGainUsed
         << " Nr. Sat. Hi Gain: " <<  fNumHiGainSaturated
         << " Nr. Sat. Lo Gain: " <<  fNumLoGainSaturated

trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h

@@ -14 +14 @@
   Float_t fArrivalTimeLoGainError; // error of the mean value of the ArrivalTime
 
-  Bool_t fIsLoGainUsed;
   Byte_t fNumHiGainSaturated;
   Byte_t fNumLoGainSaturated;
@@ -38 +37 @@
     Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated; }
 
-    Bool_t IsLoGainUsed() const { return fIsLoGainUsed; }
+    Bool_t IsLoGainUsed() const { return fNumHiGainSaturated > 0; }
     Bool_t IsValid() const;   
 

trunk/MagicSoft/Mars/msignal/Makefile

@@ -48 +48 @@
            MExtractBlindPixel.cc \
            MExtractedSignalBlindPixel.cc \
+           MTimeExtractor.cc \
+           MExtractTimeSpline.cc \
            MArrivalTime.cc \
            MArrivalTimeCalc.cc \

trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

@@ -22 +22 @@
 #pragma link C++ class MExtractedSignalBlindPixel++;
 
+#pragma link C++ class MTimeExtractor+;
+#pragma link C++ class MExtractTimeSpline+;
 #pragma link C++ class MArrivalTimeCam;
 #pragma link C++ class MArrivalTimePix;