With Alexey:

- add 'Double_t fZVertex' member, print it via context-menu function
  PrintEventInfo();

- remove verbose event printout during raw/digit processing;

- align output generated on secondary-select.

diff --git a/EVE/EveDet/AliEveT0Module.cxx b/EVE/EveDet/AliEveT0Module.cxx
index 29ba530d44f12c9a80dc97260256cbc55851fd86..293d99600ab4ddf28f1d2898d6390e40f723430a 100644 (file)
--- a/EVE/EveDet/AliEveT0Module.cxx
+++ b/EVE/EveDet/AliEveT0Module.cxx
@@ -35,8 +35,12 @@
 ClassImp(AliEveT0Module)
 
 /******************************************************************************/
-AliEveT0Module::AliEveT0Module(const Text_t* n, Int_t sigType, AliT0digit *digits, AliT0RawReader *start)
-  : TEveQuadSet(n), fSigType(sigType), fDigits(digits), fStart(start)
+AliEveT0Module::AliEveT0Module(const Text_t* n, Int_t sigType,
+                              AliT0digit *digits, AliT0RawReader *start,
+                              Double_t zvertex) :
+  TEveQuadSet(n),  fSigType(sigType),
+  fDigits(digits), fStart(start),
+  fZVertex(zvertex)
 {
   //
   // Default constructor
@@ -45,7 +49,7 @@ AliEveT0Module::AliEveT0Module(const Text_t* n, Int_t sigType, AliT0digit *digit
 
 void AliEveT0Module::PrintEventInfo()
 {
-  printf("Blabla\n");
+  printf("Z-vertex = %f\n", fZVertex);
 }
 
 /******************************************************************************/
@@ -62,7 +66,18 @@ void AliEveT0Module::LoadRaw(AliRawReader* reader)
 
   AliT0RawReader *start = new AliT0RawReader(reader);
   Int_t allData[110][5];
-  TRandom r(0);
+
+  Float_t angle  = 2 * TMath::Pi() / 12;
+  start->Next();
+  for (Int_t i=0; i<110; i++)
+  {
+    for (Int_t iHit=0; iHit<5; iHit++)
+    {
+      allData[i][iHit]= start->GetData(i,iHit);
+    }
+  }
+  Double_t zvertex = (allData[51][0] - allData[52][0])/2*25*2.99752/100;
+  //std::cout<<"zvertex= "<< zvertex <<endl;
 
   TEveRGBAPalette *rawPalette    = new TEveRGBAPalette(0, 3000);
   TEveRGBAPalette *vertexPalette = new TEveRGBAPalette(-100, 100);
@@ -82,47 +97,30 @@ void AliEveT0Module::LoadRaw(AliRawReader* reader)
 
 
   rawPalette->SetLimits(1, 3000); // Set proper raw time range.
-  TEveQuadSet* rawA = new AliEveT0Module("T0_RAW_A", 2, digits, start);
+  TEveQuadSet* rawA = new AliEveT0Module("T0_RAW_A", 2, digits, start, zvertex);
   rawA->SetPalette(rawPalette);
   rawA->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32);
   rawA->SetFrame(box);
-  TEveQuadSet* rawC = new AliEveT0Module("T0_RAW_C", 3, digits, start);
+  TEveQuadSet* rawC = new AliEveT0Module("T0_RAW_C", 3, digits, start, zvertex);
   rawC->SetPalette(rawPalette);
   rawC->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32); 
   rawC->SetFrame(box);
 
-  TEveQuadSet* vertexT0 = new AliEveT0Module("T0_Vertex", 5, digits, start);
+  TEveQuadSet* vertexT0 = new AliEveT0Module("T0_Vertex", 5, digits, start, zvertex);
   vertexT0->SetPalette(vertexPalette);
   vertexT0->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32);
  
-  Float_t angle  = 2 * TMath::Pi() / 12;
-  start->Next();
-  for (Int_t i=0; i<110; i++)
-  {
-    for (Int_t iHit=0; iHit<5; iHit++)
-    {
-      allData[i][iHit]= start->GetData(i,iHit);
-      if (allData[i][iHit] != 0) {
-        using namespace std;
-        cout <<"event "<< AliEveEventManager::GetCurrent()->GetEventId()
-            <<" i "<< i <<" "<< allData[i][iHit] - allData[0][0] <<endl;
-      }
-    }
-  }
-  Float_t zvertex= (allData[51][0] - allData[52][0])/2*25*2.99752/100;
-  using namespace std;
-  cout<<"zvertex= "<< zvertex <<endl;
   for (Int_t i=0; i<12; i++)
   {
     Float_t x = 6.5 * TMath::Sin(i * angle);
     Float_t y = 6.5 * TMath::Cos(i * angle);
-    rawA->AddHexagon(x, y, r.Uniform(-0.1, 0.1), 1.0);
+    rawA->AddHexagon(x, y, 0, 1.0);
     rawA->QuadValue(start->GetData(i+37,0)-start->GetData(0,0));
-    rawC->AddHexagon(x, y, r.Uniform(-0.1, 0.1), 1.0);
+    rawC->AddHexagon(x, y, 0, 1.0);
     rawC->QuadValue(start->GetData(i+25,0)-start->GetData(0,0));
   }
-    vertexT0->AddHexagon(0, 0, 0, 1);
-    vertexT0->QuadValue(TMath::Nint(zvertex));
+  vertexT0->AddHexagon(0, 0, 0, 1);
+  vertexT0->QuadValue(TMath::Nint(zvertex));
 
   rawA->RefitPlex();
   rawC->RefitPlex();
@@ -148,16 +146,15 @@ void AliEveT0Module::MakeModules(AliT0digit *digits)
 {
   // Make modules for digits.
 
-  TRandom r(0);
   TArrayI adc(24);
   TArrayI tdc(24);
 
   digits->GetQT1(adc);
   digits->GetTimeCFD(tdc);
-  //    printf("%3d\n",besttimeright);
-  for (Int_t i=0;i<24; i++){
-    printf("%3d %3d\n  ",adc[i], tdc[i]);
-  }
+  // printf("%3d\n",besttimeright);
+  // for (Int_t i=0;i<24; i++) {
+  //   printf("%3d %3d\n  ",adc[i], tdc[i]);
+  // }
 
   TEveRGBAPalette* adcPalette  = new TEveRGBAPalette(5, 1024);
   adcPalette->SetLimits(1, 1024); // Set proper ADC range.
@@ -180,19 +177,19 @@ void AliEveT0Module::MakeModules(AliT0digit *digits)
     Float_t x = 6.5 * TMath::Sin(i * angle);
     Float_t y = 6.5 * TMath::Cos(i * angle);
 
-    qa->AddHexagon(x, y, r.Uniform(-0.1, 0.1), 1.0);
+    qa->AddHexagon(x, y, 0, 1.0);
     qa->QuadValue(adc[i+12]);
     //    qa->QuadId(new TNamed(Form("PMT   with idx=%d", i), "PMT's aplitude in side A."));
 
-    qat->AddHexagon(x, y, r.Uniform(-0.1, 0.1), 1.0);
+    qat->AddHexagon(x, y, 0, 1.0);
     qat->QuadValue(tdc[i+12]);
     //    qat->QuadId(new TNamed(Form("Quad with idx=%d", i), "PMT's time in side A."));
 
-    qc->AddHexagon(x, y, r.Uniform(-0.1, 0.1), 1.0);
+    qc->AddHexagon(x, y, 0, 1.0);
     qc->QuadValue(adc[i]);
     // qc->QuadId(new TNamed(Form("Quad with idx=%d", i), "PMT's amplitude in side C."));
 
-    qct->AddHexagon(x, y, r.Uniform(-0.1, 0.1), 1.0);
+    qct->AddHexagon(x, y, 0, 1.0);
     qct->QuadValue(tdc[i]);
     // qct->QuadId(new TNamed(Form("Quad with idx=%d", i), "PMT's time in side C."));
   }
@@ -235,11 +232,11 @@ void AliEveT0Module::DigitSelected(Int_t idx)
     Int_t   timediff = fDigits->TimeDiff();
     Int_t   summult = fDigits->SumMult();
 
-    printf("besttimeA=%3d\n",besttimeright);
-    printf("besttimeC=%3d\n",besttimeleft);
-    printf("meantime=%3d\n",meantime);
-    printf("timediff=%3d\n",timediff);
-    printf("summult=%3d\n",summult);
+    printf("besttimeA = %3d\n", besttimeright);
+    printf("besttimeC = %3d\n", besttimeleft);
+    printf("meantime  = %3d\n", meantime);
+    printf("timediff  = %3d\n", timediff);
+    printf("summult   = %3d\n", summult);
 
     printf("  idx=%d, amplitude=%d\n",  idx, qb->fValue);
 
@@ -253,29 +250,29 @@ void AliEveT0Module::DigitSelected(Int_t idx)
     Int_t   timediff = fDigits->TimeDiff();
     Int_t   summult = fDigits->SumMult();
 
-    printf("besttimeA=%3d\n",besttimeright);
-    printf("besttimeC=%3d\n",besttimeleft);
-    printf("meantime=%3d\n",meantime);
-    printf("timediff=%3d\n",timediff);
-    printf("summult=%3d\n",summult);
+    printf("besttimeA = %3d\n",besttimeright);
+    printf("besttimeC = %3d\n",besttimeleft);
+    printf("meantime  = %3d\n",meantime);
+    printf("timediff  = %3d\n",timediff);
+    printf("summult   = %3d\n",summult);
 
     printf("  idx=%d, amplitude=%d\n",  idx, qb->fValue);
   }
   if (fSigType == 2) {
     printf("raw====================\n");
-    printf("besttimeA=%3d\n",fStart->GetData(51,0)-fStart->GetData(0,0));
-    printf("besttimeC=%3d\n",fStart->GetData(52,0)-fStart->GetData(0,0));
-    printf("meantime=%3d\n",fStart->GetData(49,0)-fStart->GetData(0,0));
-    printf("amplitude= %3d\n",fStart->GetData(idx+1,0));
+    printf("besttimeA = %3d\n",fStart->GetData(51,0)-fStart->GetData(0,0));
+    printf("besttimeC = %3d\n",fStart->GetData(52,0)-fStart->GetData(0,0));
+    printf("meantime  = %3d\n",fStart->GetData(49,0)-fStart->GetData(0,0));
+    printf("amplitude = %3d\n",fStart->GetData(idx+1,0));
 
     printf("  idx=%d, time %d\n",  idx, qb->fValue);
   }
   if (fSigType == 3) {
     printf("raw====================\n");
-    printf("besttimeA=%3d\n",fStart->GetData(51,0)-fStart->GetData(0,0));
-    printf("besttimeC=%3d\n",fStart->GetData(52,0)-fStart->GetData(0,0));
-    printf("meantime=%3d\n",fStart->GetData(49,0)-fStart->GetData(0,0));
-    printf("amplitude= %3d\n",fStart->GetData(idx+13,0));
+    printf("besttimeA = %3d\n",fStart->GetData(51,0)-fStart->GetData(0,0));
+    printf("besttimeC = %3d\n",fStart->GetData(52,0)-fStart->GetData(0,0));
+    printf("meantime  = %3d\n",fStart->GetData(49,0)-fStart->GetData(0,0));
+    printf("amplitude = %3d\n",fStart->GetData(idx+13,0));
 
     printf("  idx=%d, time %d\n",  idx, qb->fValue);
   }

diff --git a/EVE/EveDet/AliEveT0Module.h b/EVE/EveDet/AliEveT0Module.h
index 34d6fb47db344bd4fd85a6bc19740f30fa824c27..3e351d350c8a7934412df186e5ae2d2a9f602bb9 100644 (file)
--- a/EVE/EveDet/AliEveT0Module.h
+++ b/EVE/EveDet/AliEveT0Module.h
@@ -25,7 +25,9 @@ class TTree;
 class AliEveT0Module : public TEveQuadSet
 {
 public:
-  AliEveT0Module(const Text_t* n="AliEveT0Module", Int_t sigType=0, AliT0digit *digits=0,AliT0RawReader *start=0);
+  AliEveT0Module(const Text_t* n="AliEveT0Module", Int_t sigType=0,
+                AliT0digit *digits=0, AliT0RawReader *start=0,
+                Double_t zvertex=0);
   virtual ~AliEveT0Module() {}
 
   virtual void DigitSelected(Int_t idx);
@@ -41,6 +43,8 @@ protected:
   AliT0digit     *fDigits;  // Digits.
   AliT0RawReader *fStart;   // Reader.
 
+  Double_t        fZVertex; // Reconstructed vertex position.
+
 private:
   AliEveT0Module(const AliEveT0Module&);
   AliEveT0Module& operator=(const AliEveT0Module&);