Changeset 9433 for trunk

Timestamp:

04/26/09 13:15:08 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• mraw/MRawFileRead.cc (modified) (2 diffs)
• mraw/MRawRunHeader.cc (modified) (2 diffs)
• mraw/MRawRunHeader.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2009/04/26 Thomas Bretz
+
+   * mraw/MRawFileRead.cc:
+     - added consistency check for two consecutive headers
+
+   * mraw/MRawRunHeader.[h,cc]:
+     - added copy constructor
+     - added member function for conistency check
+
+
+
  2009/04/16 Thomas Bretz
 

trunk/MagicSoft/Mars/NEWS

@@ -7 +7 @@
    * Added a new palette "temp" to MH::SetPalette which should resample
      a temperature
+
+   * Added consistency check for two consecutive runs
 
  ;showplot:
@@ -37 +39 @@
 
    * Fixed a bug which caused the aerosol coefficient to be incorrectly
-     initialized. The effect might be random.
+     initialized. The effect might be random but seems to be small.
 
  ;callisto:

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -218 +218 @@
     fNumFile++;
 
+    MRawRunHeader h(*fRawRunHeader);
+
     //
     // Read RUN HEADER (see specification) from input stream
@@ -228 +230 @@
     {
         *fLog << err << "Error: Accessing file '" << name << "'" << endl;
+        return kERROR;
+    }
+
+    if (h.IsValidRun() && !fRawRunHeader->IsConsistent(h))
+    {
+        *fLog << err << "Error: Inconsistency between previous header and '" << name << "' found." << endl;
+        fRawRunHeader->Print();
         return kERROR;
     }

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -210 +210 @@
 }
 
+MRawRunHeader::MRawRunHeader(const MRawRunHeader &h)
+{
+    fMagicNumber=h.fMagicNumber;                       // File type identifier
+
+    fHeaderSizeRun=h.fHeaderSizeRun;                   // Size of run header
+    fHeaderSizeEvt=h.fHeaderSizeEvt;                   // Size of evt header
+    fHeaderSizeCrate=h.fHeaderSizeCrate;               // Size of crate header
+
+    fFormatVersion=h.fFormatVersion;                   // File format version
+    fSoftVersion=h.fSoftVersion;                       // DAQ software version
+    fFadcType=h.fFadcType;                             // FADC type (1=Siegen, 2=MUX)
+    fCameraVersion=h.fCameraVersion;                   // Camera Version (1=MAGIC I)
+    fTelescopeNumber=h.fTelescopeNumber;               // Telescope number (1=Magic I)
+    fRunType=h.fRunType;                               // Run Type
+    fRunNumber=h.fRunNumber;                           // Run number
+    fFileNumber=h.fFileNumber;                         // File number
+    memcpy(fProjectName, h.fProjectName, 101);         // Project name
+    memcpy(fSourceName, h.fSourceName, 81);            // Source name
+    memcpy(fObservationMode, h.fObservationMode, 61);  // observation mode
+    memcpy(fSourceEpochChar, h.fSourceEpochChar, 4);   // epoch char of the source
+    fSourceEpochDate=h.fSourceEpochDate;               // epoch date of the source
+    fNumCrates=h.fNumCrates;                           // number of electronic boards
+    fNumPixInCrate=h.fNumPixInCrate;                   // number of pixels in crate
+    fNumSamplesLoGain=h.fNumSamplesLoGain;             // number of logain samples stored
+    fNumSamplesHiGain=h.fNumSamplesHiGain;             // number of higain samples stored
+    fNumBytesPerSample=h.fNumBytesPerSample;           // number of bytes per sample
+    fNumEvents=h.fNumEvents;                           // number of events stored
+    fNumEventsRead=h.fNumEventsRead;                   // number of events read by the electronics
+    fSamplingFrequency=h.fSamplingFrequency;           // Sampling Frequency [MHz]
+    fFadcResolution=h.fFadcResolution;                 // number of significant bits
+    fRunStart=h.fRunStart;                             // time of run start
+    fRunStop=h.fRunStop;                               // time of run stop
+    fPixAssignment = new MArrayS(*h.fPixAssignment);   //-> pixel assignment table
+}
+
 // --------------------------------------------------------------------------
 //
@@ -217 +252 @@
 {
     delete fPixAssignment;
+}
+
+// --------------------------------------------------------------------------
+//
+// Checks for consistency between two run headers. Checks:
+//    fNumCrates
+//    fNumPixInCrate
+//    fNumSamplesLoGain
+//    fNumSamplesHiGain
+//    fNumBytesPerSample
+//
+Bool_t MRawRunHeader::IsConsistent(const MRawRunHeader &h) const
+{
+    return fNumCrates==h.fNumCrates &&
+        fNumPixInCrate==h.fNumPixInCrate &&
+        fNumSamplesLoGain==h.fNumSamplesLoGain &&
+        fNumSamplesHiGain==h.fNumSamplesHiGain &&
+        fNumBytesPerSample==h.fNumBytesPerSample;
 }
 

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -84 +84 @@
 public:
     MRawRunHeader(const char *name=NULL, const char *title=NULL);
+    MRawRunHeader(const MRawRunHeader &h);
     ~MRawRunHeader();
 
@@ -169 +170 @@
     Bool_t IsPointRun() const       { return (fRunType&0xff)==kRTPointRun; }
 
+    Bool_t IsValidRun() const { return fRunType!=kRTNone; }
+
+    Bool_t IsConsistent(const MRawRunHeader &h) const;
+
     void Print(Option_t *t=NULL) const;