Changeset 2875

Timestamp:

01/21/04 17:00:32 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mraw/MRawEvtHeader.cc (modified) (8 diffs)
• mraw/MRawRead.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/01/21: Thomas Bretz
+
+   * mraw/MRawRead.cc:
+     - restore the fake time for all runs (current time stamp in
+       the data seems to be toally nonsense)
+ 
+   * mraw/MRawEvtHeader.cc:
+     - removed decoding of real time (current time stamp in the data
+       seems to be toally nonsense)
+
 
  2004/01/21: Abelardo moralejo
@@ -28 +39 @@
      - Adapted to change above. Changed also task instance name from 
        mccalibcalc to mccalibupdate.
+
 
 

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -239 +239 @@
 {
     // BADC|1032 --> DCBA|3210 (Byte swap - exchange MSB and LSB)
-    *fLog << hex << all << endl << abstime[0] << " " << abstime[1] << endl;
+    /*
+    *fLog << hex << all << setfill('0') << setw(8) << abstime[0] << " " << setw(8) << abstime[1] << "  ";
+
+    for (int i=4*8-1; i>=0; i--)
+        *fLog << (int)(abstime[0]&BIT(i)?1:0);
+    *fLog << " ";
+    for (int i=4*8-1; i>=0; i--)
+       *fLog << (int)(abstime[1]&BIT(i)?1:0);
+    */
+    *fLog << endl;
 
     abstime[0] = (abstime[0]<<16) | (abstime[0]>>16);
@@ -249 +258 @@
     abstime[1] = abstime[1]<<8&0xff00 | abstime[1]>>8&0x00ff | abstime[1]&0xffff0000;
 
-    for (int i=4*8-1; i>=0; i--)
-        *fLog << (int)(abstime[0]&BIT(i)?1:0);
-    *fLog << " ";
-    for (int i=4*8-1; i>=0; i--)
-        *fLog << (int)(abstime[1]&BIT(i)?1:0);
-    *fLog << endl;
 
 /*    *fLog << hex << abstime[0] << " " << abstime[1] << endl;
@@ -286 +289 @@
     // hms   =3210 -->  h=2:4 m=3:4 s=3:4
     // subsec=DCBA --> subsec?
+    /*
     *fLog << all << dec << setfill('0') << setw(2) << (int)h << ":" << setw(2) << (int)m << ":" << setw(2) << (int)s;
     *fLog << " " << hex;
@@ -293 +297 @@
     *fLog << (int)(abstime[0]>> 0 & 0xf);
     *fLog << endl;
-
+    */
     // Update the time stamp with the current event time.
     // Make sure, that the time stamp was initialized correctly
@@ -300 +304 @@
     // Here the nanosec precision is ignored... (FIXME!)
 
+    return kTRUE;
+
     static int i=0;
     i++;
-    fTime->Print();
-    fTime->UpdMagicTime(h, m, s, 0/*ms*/);
-    fTime->Print();
-    return i<5;
+    //fTime->Print();
+    //    fTime->UpdMagicTime(h, m, s, 0/*ms*/);
+    //fTime->Print();
+    return i<25;
     //return fTime->UpdMagicTime(h, m, s, ms);
 }
@@ -324 +330 @@
     fin.read((char*)&fDAQEvtNumber, 4);  // Total=4
 
-    *fLog << "N: " << fDAQEvtNumber << endl;
-
     UInt_t abstime[2];                   // BADC|1032
     fin.read((char*)abstime,        8);  // Total=12
+    /*
     if (!DecodeTime(abstime))
     {
@@ -333 +338 @@
         return kFALSE;
     }
-
+    */
     Byte_t dummy[4];
     fin.read((char*)&fNumTrigLvl1,  4);  // Total=16
@@ -342 +347 @@
     fin.read((char*)fPixLoGainOn->GetArray(), fPixLoGainOn->GetSize());
 
-    *fLog << "T: " << fTrigType << endl;
-
     fNumLoGainOn = 0;
     for (unsigned int i=0; i<fPixLoGainOn->GetSize(); i++)

trunk/MagicSoft/Mars/mraw/MRawRead.cc

@@ -146 +146 @@
     m %= 360; // 6h
 
-    fRawEvtTime->Set(fRawRunHeader->GetRunStart().Year(),
-                     fRawRunHeader->GetRunStart().Month(),
-                     fRawRunHeader->GetRunStart().Day(),
-                     m/60, m%60, s, ms, ns);
+    fRawEvtTime->UpdMagicTime(m/60, m%60, s, ms/*, ns*/);
 }
 
@@ -203 +200 @@
     // for which no time stamp was available.
     // For this runs a fake time stamp is created
-    if (fRawRunHeader->GetRunNumber()<3490)
-        CreateFakeTime();
+    //if (fRawRunHeader->GetRunNumber()<3490)
+    CreateFakeTime();
 
     // FIXME: For all other runs we should enhance the precision