Changeset 9069 for trunk

Timestamp:

08/02/08 12:15:18 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• NEWS (modified) (2 diffs)
• msignal/MExtractTimeAndCharge.cc (modified) (2 diffs)
• msignal/MExtractTimeAndCharge.h (modified) (1 diff)
• msignal/MExtractor.cc (modified) (1 diff)

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
 == <cvs> ==
+
+ ;Database
+
+   * Added the median number of photo electrons from the calibration
+     pulses to the db (fMedNumPheInner, fMedNumPheOuter) and the relative
+     error of their raw counts (fRelChargeRmsInner, fRelChargeRmsOuter)
+
+   * Added fTotOnTime, which is the on-time as given by the run-headers
+     (in contradiction to fAbsOnTime which comes from CC)
 
  ;general
@@ -28 +37 @@
    * MReadTree can now read also files not written by MARS and store
      the data encapsulated in emulated MParContainers
-
-   * Added the median number of photo electrons from the calibration
-     pulses to the db (fMedNumPheInner, fMedNumPheOuter) and the relative
-     error of their raw counts (fRelChargeRmsInner, fRelChargeRmsOuter)
 
    * added a new starguider calibration valid since 15.1.08

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.69 2008-05-15 18:37:27 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.70 2008-08-02 11:11:21 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -104 +104 @@
 using namespace std;
 
-const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -2.5;
+const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -1.0;  // was -2.5
 const UInt_t  MExtractTimeAndCharge::fgLoGainSwitch     =  120;
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -35 +35 @@
   UInt_t  GetLoGainSwitch      () const { return fLoGainSwitch;     }
 
-  void SetLoGainStartShift( const Float_t f=fgLoGainStartShift ) { fLoGainStartShift = f + fOffsetLoGain;  }
+  void SetLoGainStartShift( const Float_t f=fgLoGainStartShift ) { fLoGainStartShift = f;  }
   void SetLoGainSwitch    ( const UInt_t  i=fgLoGainSwitch     ) { fLoGainSwitch     = i; }
 

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -358 +358 @@
 void MExtractor::Print(Option_t *o) const
 {
-    if (IsA()==MExtractor::Class())
-        *fLog << GetDescriptor() << ":" << endl;
+    *fLog << GetDescriptor() << ":" << endl;
 
     *fLog << " Hi Gain Range:      " << Form("%2d %2d", fHiGainFirst, fHiGainLast) << endl;