Changeset 11108 for trunk/FACT++

Timestamp:

06/22/11 15:48:42 (13 years ago)

Author:

tbretz

Message:

Fixed display of board and patch rate.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -1171 +1171 @@
         for (int i=0; i<160; i++)
             fGraphPatchRate[i].SetPoint(fGraphPatchRate[i].GetN(),
-                                       t0+sdata.fTimeStamp, float(sdata.fRatePatch[i])/fFtmStaticData.fPrescaling[i]/1000);
+                                       t0+sdata.fTimeStamp/1000000., float(sdata.fRatePatch[i])*2/fFtmStaticData.fPrescaling[i]);
         for (int i=0; i<40; i++)
             fGraphBoardRate[i].SetPoint(fGraphBoardRate[i].GetN(),
-                                       t0+sdata.fTimeStamp, float(sdata.fRateBoard[i])/fFtmStaticData.fPrescaling[i]/1000);
+                                       t0+sdata.fTimeStamp/1000000., float(sdata.fRateBoard[i])*2/fFtmStaticData.fPrescaling[i]);
 
         c->Modified();
         c->Update();
+
+        //fGraphFtmRate.ComputeRange(x[0], x[1], x[2], x[3]);
 
         // ----------------------------------------------
@@ -1222 +1224 @@
             c->GetListOfPrimitives()->Remove(c->FindObject("BoardRate"));
 
+        c->cd();
+
         if (fRatePatch1->value()>=0)
+        {
+            fGraphPatchRate[fRatePatch1->value()].SetLineColor(kRed);
+            fGraphPatchRate[fRatePatch1->value()].SetMarkerColor(kRed);
             fGraphPatchRate[fRatePatch1->value()].Draw("PL");
+        }
         if (fRatePatch2->value()>=0)
+        {
+            fGraphPatchRate[fRatePatch2->value()].SetLineColor(kGreen);
+            fGraphPatchRate[fRatePatch2->value()].SetMarkerColor(kGreen);
             fGraphPatchRate[fRatePatch2->value()].Draw("PL");
+        }
         if (fRateBoard1->value()>=0)
+        {
+            fGraphBoardRate[fRateBoard1->value()].SetLineColor(kMagenta);
+            fGraphBoardRate[fRateBoard1->value()].SetMarkerColor(kMagenta);
             fGraphBoardRate[fRateBoard1->value()].Draw("PL");
+        }
         if (fRateBoard2->value()>=0)
+        {
+            fGraphBoardRate[fRateBoard2->value()].SetLineColor(kCyan);
+            fGraphBoardRate[fRateBoard2->value()].SetMarkerColor(kCyan);
             fGraphBoardRate[fRateBoard2->value()].Draw("PL");
+        }
 #endif
     }
@@ -2307 +2327 @@
         {
             fGraphPatchRate[i].SetName("PatchRate");
-            fGraphPatchRate[i].SetLineColor(kBlue);
-            fGraphPatchRate[i].SetMarkerColor(kBlue);
+            //fGraphPatchRate[i].SetLineColor(kBlue);
+            //fGraphPatchRate[i].SetMarkerColor(kBlue);
             fGraphPatchRate[i].SetMarkerStyle(kFullDotMedium);
         }
@@ -2314 +2334 @@
         {
             fGraphBoardRate[i].SetName("BoardRate");
-            fGraphBoardRate[i].SetLineColor(kBlue);
-            fGraphBoardRate[i].SetMarkerColor(kBlue);
+            //fGraphBoardRate[i].SetLineColor(kBlue);
+            //fGraphBoardRate[i].SetMarkerColor(kBlue);
             fGraphBoardRate[i].SetMarkerStyle(kFullDotMedium);
         }
@@ -2351 +2371 @@
 
         TCanvas *c = fFtmRateCanv->GetCanvas();
-        c->SetBit(TCanvas::kNoContextMenu);
+        //c->SetBit(TCanvas::kNoContextMenu);
         c->SetBorderMode(0);
         c->SetFrameBorderMode(0);
@@ -2370 +2390 @@
 
         c = fRatesCanv->GetCanvas();
-        c->SetBit(TCanvas::kNoContextMenu);
+        //c->SetBit(TCanvas::kNoContextMenu);
         c->SetBorderMode(0);
         c->SetFrameBorderMode(0);