Effective C++ & documentation, bug fix in Online display

[u/mrichter/AliRoot.git] / HLT / PHOS / OnlineDisplay / AliHLTPHOSOnlineDisplayRawTab.cxx

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.cxx
index ad5b5a84bb076c5d73624934088174f6e2683b0d..e8697ce952bd43c7c38369d37c7b6ba8e2468a9b 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.cxx
@@ -62,7 +62,7 @@ AliHLTPHOSOnlineDisplayRawTab::ReadBlockData(HOMERReader *homerReaderPtr)
          {
            tmpz =  rcuChannelDataPtr->fValidData[ch].fZ;
            tmpx =  rcuChannelDataPtr->fValidData[ch].fX;       
-           tmpSampleCnt =  rcuChannelDataPtr->fValidData[ch].fNSamples;
+           tmpSampleCnt =  rcuChannelDataPtr->fValidData[ch].fDataSize -2;
 
            //      fgChannelDataPlotPtr[tmpz][tmpx]->SetFillColor(3);
 
@@ -74,10 +74,13 @@ AliHLTPHOSOnlineDisplayRawTab::ReadBlockData(HOMERReader *homerReaderPtr)
                  {
                    fgChannelDataPlotPtr[tmpz][tmpx]->SetBinContent(sample,  rcuChannelDataPtr->fValidData[ch].fChannelData[sample]);
                  }
+
              }
          }
        }
+
       blk =  homerReaderPtr->FindBlockNdx("ATADNAHC","SOHP", 0xeFFFFFFF, blk+1);
+
     }
 }
 
@@ -111,9 +114,11 @@ AliHLTPHOSOnlineDisplayRawTab::InitDisplay(TGTab *tabPtr)
     {
       for(int x = 0; x < N_XCOLUMNS_RCU; x ++)
        {
-         sprintf(tmpHistoName, "blablaz%d x%d",z, x);
-         fgChannelDataPlotPtr[z][x] = new TH1D(tmpHistoName, tmpHistoName, 300, 0, 299);
-         fgChannelDataPlotPtr[z][x]->SetMaximum(MAX_BIN_VALUE); 
+         sprintf(tmpHistoName, "row %d column %d",z, x);
+         //      fgChannelDataPlotPtr[z][x] = new TH1D(tmpHistoName, tmpHistoName, 300, 0, 299);
+         fgChannelDataPlotPtr[z][x] = new AliHLTPHOSTH1D(tmpHistoName, tmpHistoName, 100, 0, 100);
+         //      fgChannelDataPlotPtr[z][x]->SetMaximum(MAX_BIN_VALUE); 
+         fgChannelDataPlotPtr[z][x]->SetMaximum(1023); 
          fgChannelDataPlotPtr[z][x]->Reset();
        }
     }
@@ -140,17 +145,51 @@ AliHLTPHOSOnlineDisplayRawTab::UpdateDisplay()
 {
   fgTestCanvasPtr = new TCanvas("TEST", "testcanvas", 1200, 1000);  
 
+  int startZ = 25;
+  int endZ   = 31;
+  int startX = 20;
+  int endX   = 27;
+
+  int nRows =  endZ - startZ;
+  int nCols =  endX - startX;
+
+
+  //  int start = 0;
+  //  fgTestCanvasPtr->Divide(N_XCOLUMNS_RCU, N_ZROWS_RCU, 0, 0);
+  cout <<"nRows = "<< nRows << endl;
+  cout <<"nCols = "<< nCols << endl;
+
 
   /*
-  fgTestCanvasPtr->Divide(N_XCOLUMNS_RCU, N_ZROWS_RCU, 0, 0);
+  fgTestCanvasPtr->Divide(nCols, nRows, 0, 0);
+  //  fgTestCanvasPtr->Divide(nRows,  nCols,  0, 0);
+  
+   
+  for(int z = startZ; z < endZ; z ++)
+    {
+      for(int x = startX; x < endX; x ++)
+       {
+         cout << "z = "<< z << " x= " << x<<endl;
+         //      fgTestCanvasPtr->cd(x*N_ZROWS_RCU +z +1);
+         //      fgTestCanvasPtr->cd((z - startZ)*nCols +x +1);
+         fgTestCanvasPtr->cd((z - startZ)*nCols +x);
+         //      fgTestCanvasPtr->cd( z*nCols    +x);
+
+         cout << "(z - startZ)*nCols +x  ="<< (z - startZ)*nCols +x <<endl;
+         
+         fgChannelDataPlotPtr[x][z]->Draw();
+       } 
+    }
+  */
 
-  for(int z = 0; z < N_ZROWS_RCU; z ++)
+  
+  /*  
+  for(int z = 0; z < nRows; z ++)
     {
-      for(int x = 0; x < N_XCOLUMNS_RCU; x ++)
+      for(int x = 0; x < nCols; x ++)
        {
          //      fgTestCanvasPtr->cd(x*N_ZROWS_RCU +z + 1);
-         fgTestCanvasPtr->cd(z*N_XCOLUMNS_RCU +x + 1);
-
+         fgTestCanvasPtr->cd(z*nCols +x + 1);
          fgChannelDataPlotPtr[z][x]->Draw();
        } 
     }
@@ -158,19 +197,49 @@ AliHLTPHOSOnlineDisplayRawTab::UpdateDisplay()
 
 
 
+  
+  //  fgTestCanvasPtr->Divide(N_XCOLUMNS_RCU, N_ZROWS_RCU, 0, 0);
+  
+  /*
+    for(int z = 0; z < N_ZROWS_RCU; z ++)
+    {
+    for(int x = 0; x < N_XCOLUMNS_RCU; x ++)
+    {
+    //   fgTestCanvasPtr->cd(x*N_ZROWS_RCU +z + 1);
+         
+    fgTestCanvasPtr->cd(z*N_XCOLUMNS_RCU +x + 1);
+         
+    //   fgTestCanvasPtr->cd(z*N_ZROWS_RCU +x + 1);
+         
+    fgChannelDataPlotPtr[z][x]->Draw();
+    } 
+    }
+  */
+
+
+  
   fgTestCanvasPtr->Divide(N_XCOLUMNS_RCU, N_ZROWS_RCU, 0, 0);
 
+  
   for(int z = 0; z < N_ZROWS_RCU; z ++)
     {
       for(int x = 0; x < N_XCOLUMNS_RCU; x ++)
        {
          //      fgTestCanvasPtr->cd(x*N_ZROWS_RCU +z + 1);
-         fgTestCanvasPtr->cd(z*N_XCOLUMNS_RCU +x + 1);
-
+         
+         fgTestCanvasPtr->cd(z*N_XCOLUMNS_RCU +x +1);
+         
+         //   fgTestCanvasPtr->cd(z*N_ZROWS_RCU +x + 1);
+         
          fgChannelDataPlotPtr[z][x]->Draw();
        } 
     }
+  
+ 
+
+ 
 
   fgTestCanvasPtr->Update();
-  
 }
+
+