Changeset 9229 for trunk/MagicSoft/Mars/mraw

Timestamp:

01/18/09 14:45:10 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

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

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -92 +92 @@
     UInt_t   GetPulserSlotPattern()  const;
 
-    // Setter
+    // Setter (ONLY for Monte Carlo purpose)
     void FillHeader(UInt_t, Float_t=0);
 
-    void  SetTriggerPattern( const UInt_t pattern )  {  fTrigPattern[0] = pattern; } // Only for MC!
-    void  SetCalibrationPattern( const UInt_t pattern )  {  fTrigPattern[1] = pattern; } // Only for MC!
+    void  SetTriggerPattern( const UInt_t pattern )  {  fTrigPattern[0] = pattern; }
+    void  SetCalibrationPattern( const UInt_t pattern )  {  fTrigPattern[1] = pattern; }
+    void  SetDAQEvtNumber(const UInt_t n) { fDAQEvtNumber = n; }
 
     // TObject

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -1127 +1127 @@
         break;
     case 2:
+        fNumSamplesHiGain  =   50;
         fNumSamplesLoGain  =    0;
-        fNumSamplesHiGain  =   50;
         fNumBytesPerSample =    2;    // number of bytes per sample
         fSamplingFrequency = 2000;    // Sampling Frequency [MHz]
         fFadcResolution    =   12;    // number of significant bits
         break;
+    case 3:
+        fNumSamplesHiGain  =  150;
+        fNumSamplesLoGain  =    0;
+        fNumBytesPerSample =    2;    // number of bytes per sample
+        fSamplingFrequency = 1000;    // Sampling Frequency [MHz]
+        fFadcResolution    =   12;    // number of significant bits
+        break;
     }
 
@@ -1152 +1159 @@
         fNumPixInCrate = 577;
         break;
+    case 2:
+        fNumCrates     =   1;
+        fNumPixInCrate = 703;
+        break;
     }
 
@@ -1161 +1172 @@
 
     for (int i=0; i<n; i++)
-        (*fPixAssignment)[i] = i;
+        (*fPixAssignment)[i] = i+1;
 }