Changeset 11223

Timestamp:

06/30/11 20:18:08 (13 years ago)

Author:

neise

Message:

Fixed ADC pipeline display

File:

• trunk/FACT++/gui/FactGui.h (modified) (5 diffs)

trunk/FACT++/gui/FactGui.h

@@ -994 +994 @@
         int16_t StartTM;          // First Channel for TimeMark (sorted Hardware ID) ; -1 if not filled
 
-        uint16_t Adc_Data[];     // final length defined by malloc ....
+         int16_t Adc_Data[];     // final length defined by malloc ....
 
     } __attribute__((__packed__));;
@@ -1035 +1035 @@
             //hist->SetBit(TH1::kNoTitle);
             hist.SetMarkerStyle(kFullDotMedium);
+            hist.SetMarkerColor(kBlue);
             hist.SetYTitle("Voltage [mV]");
             hist.GetXaxis()->CenterTitle();
@@ -1040 +1041 @@
             hist.SetMinimum(-1026);
             hist.SetMaximum(1025);
-            h = hist.DrawCopy("P");
+            h = hist.DrawCopy("PL");
             h->SetDirectory(0);
         }
 
         ostringstream str;
-        str << "ADC Pipeline (start=" << dat.StartTM << ")";
+        str << "ADC Pipeline (start=" << dat.StartPix << ") " << dat.EventNum;
         h->SetXTitle(str.str().c_str());
 
@@ -1053 +1054 @@
 
         for (int i=0; i<dat.Roi; i++)
-            h->SetBinContent(i+1, dat.Adc_Data[i]*0.5-1024);
+            h->SetBinContent(i+1, dat.Adc_Data[i]*0.5);
 
         c->Modified();
@@ -1205 +1206 @@
             tip << "<th>" << b << "</th>";
         tip << "</tr>";
+
+        /*
+         tip << "<tr>" << hex;
+         tip << "<th>" << d.ptr<uint16_t>()[0] << " " << (d.ptr<uint16_t>()[0]&bitmask) << "</th>";
+         tip << "<th>" << d.ptr<uint16_t>()[1] << " " << (d.ptr<uint16_t>()[1]&bitmask) << "</th>";
+         tip << "</tr>";
+         */
 
         for (int c=0; c<4; c++)