Changeset 8342

Timestamp:

03/01/07 18:21:47 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHCalibrationChargeCam.cc (modified) (2 diffs)
• mhcalib/MHCalibrationPulseTimeCam.cc (modified) (3 diffs)
• mraw/MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -45 +45 @@
      - fixed ReadEnv
 
+   * mraw/MRawRunHeader.h:
+     - added new member function GetNumSamples
+
 
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.52 2007-03-01 17:59:12 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.53 2007-03-01 18:21:08 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -387 +387 @@
   if (fGeom->InheritsFrom("MGeomCamMagic"))
     if ( fColor == MCalibrationCam::kBLUE)
-      SetLoGainLast(2.*fLoGainLast - fLoGainFirst);
+      SetBinning(fLoGainNbins, fLoGainFirst, 2.*fLoGainLast - fLoGainFirst);
   
   InitHiGainArrays(npixels,nareas,nsectors);

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.27 2007-03-01 18:05:42 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.28 2007-03-01 18:21:08 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -707 +707 @@
 
   Int_t rc = MHCalibrationCam::ReadEnv(env,prefix,print);
-  if (rc=kERROR)
-    return kERROR;
-   
+  if (rc==kERROR)
+      return kERROR;
+
   if (IsEnvDefined(env, prefix, "SaturationLimit", print))
     {
@@ -715 +715 @@
       rc = kTRUE;
     }
-  
+
   if (IsEnvDefined(env, prefix, "LowerSignalLimit", print))
     {

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -99 +99 @@
     UShort_t GetNumSamplesLoGain() const  { return fNumSamplesLoGain; }
     UShort_t GetNumSamplesHiGain() const  { return fNumSamplesHiGain; }
+    UInt_t   GetNumSamples() const  { return fNumSamplesHiGain+fNumSamplesLoGain; }
     UInt_t   GetNumEvents() const         { return fNumEvents; }
     const MTime &GetRunStart() const      { return fRunStart; }