Changeset 8699

Timestamp:

08/23/07 11:56:56 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mraw/MRawRunHeader.cc (modified) (7 diffs)
• mraw/MRawRunHeader.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -44 +44 @@
      - added the possibility to set a function which converts the
        result of the rf. eg "pow(10, x)"
+
+   * mraw/MRawRunHeader.[h,cc]:
+     - replaced fNumSignificantBits by fFadcResolution for compatibility
+     - replaced fFreqSampling by fSamplingFrequency for compatibility
+     - increased ClassVersion to 9
 
 

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -36 +36 @@
 //  -----------------
 //   + fNumEventsRead;
+//   + fSamplingFrequency
+//   - fFreqSampling
+//   + fFadcResolution;
+//   - fNumSignificantBits
 //
 //  Format Version 8:
@@ -41 +45 @@
 //   + fNumBytesPerSample;
 //   + fFreqSampling;
-//   + fNumSignificantBits;
+//   + fNumSignificantBits
 //   * changes in MRawCrateHeader
 //
@@ -85 +89 @@
 //  -----------------
 //   - added fNumBytesPerSample;
-//   - added fFreqSampling;
-//   - added fNumSignificantBits;
+//   - added fSamplingFrequency;
+//   - added fFadcResolution;
 //
 //  Class Version 5:
@@ -167 +171 @@
     fNumEvents=0;
     fNumBytesPerSample=1;
-    fFreqSampling=300;
-    fNumSignificantBits=8;
+    fSamplingFrequency=300;
+    fFadcResolution=8;
 }
 
@@ -482 +486 @@
     // New in general features: (should they be included in new MAGIC1 formats, too?)
     fNumBytesPerSample  = 1;      // 2 for MUX DATA
-    fFreqSampling       = 300;
-    fNumSignificantBits = 8;
+    fSamplingFrequency  = 300;
+    fFadcResolution = 8;
     if (fFormatVersion>7)
     {
         fin.read((char*)&fNumBytesPerSample,  2);
-        fin.read((char*)&fFreqSampling,       2); // [MHz], 2000 for MuxFadc
-        fin.read((char*)&fNumSignificantBits, 1); // nominal resolution [# Bits], 10 for MuxFadc
+        fin.read((char*)&fSamplingFrequency,  2); // [MHz], 2000 for MuxFadc
+        fin.read((char*)&fFadcResolution, 1); // nominal resolution [# Bits], 10 for MuxFadc
 
         if (fNumBytesPerSample!=2)
@@ -581 +585 @@
     *fLog << "Num Pixels:   " << GetNumNormalPixels() << " (normal) + " << GetNumSpecialPixels() << " (special) = " << GetNumConnectedPixels() << " (total)" << endl;
     if (fFormatVersion>6)
-        *fLog << "Sampling:     " << fFreqSampling << "MHz with " << (int)fNumSignificantBits << " significant bits" << endl;
+        *fLog << "Sampling:     " << fSamplingFrequency << "MHz with " << (int)fFadcResolution << " significant bits" << endl;
     *fLog << "Samples:      " << fNumSamplesHiGain << "/" << fNumSamplesLoGain << " (hi/lo) * " << fNumBytesPerSample << "B/sample = " << (fNumSamplesLoGain+fNumSamplesHiGain) * fNumCrates * fNumPixInCrate * fNumBytesPerSample/1000 << "kB/Evt" << endl;
     *fLog << "Evt Counter:  " << fNumEvents;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -58 +58 @@
     UInt_t    fNumEvents;            // number of events stored
     UInt_t    fNumEventsRead;        // number of events read by the electronics
-    UShort_t  fFreqSampling;         // Sampling Frequency [MHz]
-    Byte_t    fNumSignificantBits;   // number of significant bits
+    UShort_t  fSamplingFrequency;    // Sampling Frequency [MHz]
+    Byte_t    fFadcResolution;       // number of significant bits
     MTime     fRunStart;             // time of run start
     MTime     fRunStop;              // time of run stop
@@ -108 +108 @@
     UInt_t   GetNumEvents() const         { return fNumEvents; }
     UInt_t   GetNumEventsRead() const     { return fNumEventsRead; }
-    UShort_t GetFreqSampling() const      { return fFreqSampling; }
+    UShort_t GetFreqSampling() const      { return fSamplingFrequency; }
     const MTime &GetRunStart() const      { return fRunStart; }
     const MTime &GetRunEnd() const        { return fRunStop; }
@@ -135 +135 @@
     Bool_t ReadEvt(istream& fin);
 
-    ClassDef(MRawRunHeader, 7)  // storage container for general info
+    ClassDef(MRawRunHeader, 9)  // storage container for general info
 };
 #endif