Changeset 9309 for trunk/MagicSoft/Mars/mraw

Timestamp:

02/09/09 14:14:59 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawRunHeader.cc (modified) (3 diffs)
• MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -938 +938 @@
         switch (fFadcType)
         {
-        case 1: *fLog << "Siegen"; break;
-        case 2: *fLog << "MUX"; break;
+        case 1:      *fLog << "Siegen"; break;
+        case 2:      *fLog << "MUX"; break;
+        case 0xffff: *fLog << "artificial"; break;
         default: *fLog << "unknown";
         }
@@ -953 +954 @@
     *fLog << "Source:      '" << fSourceName << "' " << "  ";
     *fLog << fSourceEpochChar << dec << fSourceEpochDate << endl;
-    *fLog << "Run Start:    " << fRunStart << endl;
-    *fLog << "Run Stop:     " << fRunStop << endl;
-    *fLog << "Crates:       " << fNumCrates << " x " << fNumPixInCrate << " Pixel/Crate = " << fNumCrates*fNumPixInCrate << " Pixel/Evt" << endl;
-    *fLog << "Num Pixels:   " << GetNumNormalPixels() << " (normal) + " << GetNumSpecialPixels() << " (special) = " << GetNumConnectedPixels() << " (total)" << endl;
+    if (fRunStart)
+        *fLog << "Run Start:    " << fRunStart << endl;
+    if (fRunStop)
+        *fLog << "Run Stop:     " << fRunStop << endl;
+    if (fNumCrates>0 || fNumPixInCrate>0)
+        *fLog << "Crates:       " << fNumCrates << " x " << fNumPixInCrate << " Pixel/Crate = " << fNumCrates*fNumPixInCrate << " Pixel/Evt" << endl;
+    if (GetNumConnectedPixels()>0)
+        *fLog << "Num Pixels:   " << GetNumNormalPixels() << " (normal) + " << GetNumSpecialPixels() << " (special) = " << GetNumConnectedPixels() << " (total)" << endl;
     if (fFormatVersion>6)
         *fLog << "Sampling:     " << fSamplingFrequency << "MHz with " << (int)fFadcResolution << " significant bits" << endl;
@@ -1248 +1253 @@
     fNumEventsRead = num;
 }
+
+// --------------------------------------------------------------------------
+//
+//  NumSamples: 50
+//  NumBytePerSample: 2
+//  SamplingFrequency: 2000
+//  FadcResolution: 12
+//  FadcType: XXXX
+//
+Int_t MRawRunHeader::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+
+    if (IsEnvDefined(env, prefix, "NumSamples", print))
+    {
+        rc = kTRUE;
+        fNumSamplesHiGain = GetEnvValue(env, prefix, "NumSamples", fNumSamplesHiGain);
+        fNumSamplesLoGain = 0;
+    }
+
+    if (IsEnvDefined(env, prefix, "NumBytesPerSample", print))
+    {
+        rc = kTRUE;
+        fNumBytesPerSample = GetEnvValue(env, prefix, "NumBytesPerSample", fNumBytesPerSample);
+    }
+
+    if (IsEnvDefined(env, prefix, "SamplingFrequency", print))
+    {
+        rc = kTRUE;
+        fSamplingFrequency = GetEnvValue(env, prefix, "SamplingFrequency", fSamplingFrequency);
+    }
+
+    if (IsEnvDefined(env, prefix, "FadcResolution", print))
+    {
+        rc = kTRUE;
+        fFadcResolution = GetEnvValue(env, prefix, "FadcResolution", fFadcResolution);
+    }
+    // Saturation behaviour etc.
+    if (IsEnvDefined(env, prefix, "FadcType", print))
+    {
+        //rc = kTRUE;
+        //TString type = GetEnvValue(env, prefix, "FadcType", "");
+        // Eval "Siegen", "MUX", Dwarf"
+    }
+    else
+        if (rc)
+            fFadcType = 0xffff; // "Artificial"
+
+    return rc;
+}
+

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -78 +78 @@
 
     Bool_t ReadEvtOld(istream& fin);
+
+    // MParContainer
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
 public: