Changeset 4917 for trunk/MagicSoft

Timestamp:

09/10/04 10:27:55 (20 years ago)

Author:

stamerra

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mpisa/classes

Files:

• MReportTrigger.cc (modified) (6 diffs)
• MReportTrigger.h (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mpisa/classes/MReportTrigger.cc

@@ -94 +94 @@
 Bool_t MReportTrigger::SetupReading(MParList &plist)
 {
-  fPixel = (MTriggerIPR*)plist.FindCreateObj("MTriggerIPR");
-  if (!fPixel)
+  fIPR = (MTriggerIPR*)plist.FindCreateObj("MTriggerIPR");
+  if (!fIPR)
     return kFALSE;
 
@@ -165 +165 @@
        }
     TString descriptor = str(0, ws);
-    *fLog  << descriptor <<endl;
+    //*fLog  << descriptor <<endl;
     str.Remove(0, ws);
       
@@ -175 +175 @@
         }
       str.Remove(0, len); // Remove Prescal. factors from report string
-      *fLog << warn << fPrescFactor->fPrescFact[i]<<endl;
+      // *fLog << warn << fPrescFactor->fPrescFact[i]<<endl;
     }
   str=str.Strip(TString::kLeading);  
@@ -305 +305 @@
         }
       str.Remove(0, len); // Remove dummies from report string
+
     }
 
@@ -320 +321 @@
 {
 
+    // Read Individual pixel rates
+    const char *pos = str.Data();
+    const char *end = str.Data() + 340*8;
+ 
+    Int_t i=0,n,len;
+    short dummy;
+    while (pos < end)
+    {
+        const Char_t hex[9] = { pos[0], pos[1], pos[2], pos[3],pos[4],pos[5],pos[6],pos[7],0 };
+        n = sscanf(hex, "%hx", &dummy);
+        pos+=8;
+        if (n!=1)
+        {
+            *fLog << warn << "WARNING - Rate #" << i << " missing." << endl;
+            return kFALSE;
+        }
+        *fLog << warn << " " << hex ;
+    }
+    *fLog <<endl;
+
+
+    str.Remove(0, end-str.Data()); // Remove IPR hex  from report string
+    str.Strip(TString::kBoth);
+
+    
+    *fLog << warn << "string: " << str << " ==== " <<str.Data() << endl;
+
+  for (i=0;i<397;i++)
+    {
+      n = sscanf(str.Data(), " %ld %n", &fIPR->fIPR[i++], &len);
+      if (n!=1)
+        {
+          *fLog << warn << "WARNING - IPR dec #" << i << " missing." << endl;
+          return kCONTINUE;
+        }
+      str.Remove(0, len); // Remove IPR dec from report string
+
+      *fLog << warn<< " - " << dummy ;
+    }
+
+  str=str.Strip(TString::kLeading);  
+    
 
   *fLog << warn << "IPR ok!" <<endl;
@@ -402 +445 @@
       return kCONTINUE;
 
-    /*
-
-    // Read Individual pixel rates
-    pos = str.Data();
-     end = str.Data() + 344;
  
-    Int_t i=0;
-    while (pos < end)
-    {
-        const Char_t hex[4] = { pos[0], pos[1], pos[2], 0 };
-        n = sscanf(hex, "%hx", &fRates->fRates[i++]);
-        pos++;
-        if (n!=1)
-        {
-            *fLog << warn << "WARNING - Rate #" << i << " missing." << endl;
-            return kFALSE;
-        }
-    }
-
-    */
-
-    str.Remove(0,len);
-    str.Strip(TString::kBoth);
+
+  //    str.Remove(0,len);
+  //  str.Strip(TString::kBoth);
+
+  //*fLog << warn << " str=" << str << endl;
 
     return str==(TString)"OVER" ? kTRUE : kCONTINUE;

trunk/MagicSoft/Mars/mtemp/mpisa/classes/MReportTrigger.h

@@ -24 +24 @@
   
   MTriggerBit *fBit;        //! container of the L2 prescaler rates
-  MTriggerIPR *fPixel;      //! container of the IPR
+  MTriggerIPR *fIPR;        //! container of the IPR
   MTriggerCell *fCell;      //! container of the L1 cell trigger rates
   MTriggerPrescFact *fPrescFactor;  //! container of the L2 prescaling factors