adding availability check for a list of OCDB objects, code cleanup and updated docume...

[u/mrichter/AliRoot.git] / HLT / TRD / AliHLTTRDCluster.cxx

diff --git a/HLT/TRD/AliHLTTRDCluster.cxx b/HLT/TRD/AliHLTTRDCluster.cxx
index 50d85ffc6f2aa0586e6a60656ece79ecc6a57b84..0dda8d8581bfaa60720d8758e742e64ead4d57de 100644 (file)
--- a/HLT/TRD/AliHLTTRDCluster.cxx
+++ b/HLT/TRD/AliHLTTRDCluster.cxx
@@ -8,15 +8,13 @@ AliHLTTRDCluster::AliHLTTRDCluster():
   fX(0),
   fY(0),
   fZ(0),
-  fQ(0),
-  fIsInChamber(kFALSE),
-  fIsShared(kFALSE),
   fDetector(-1),
   fLocalTimeBin(0),
   fClusterMasking(0),
   fPadCol(0),
   fPadRow(0),
-  fPadTime(0)
+  fPadTime(0),
+  fBits(0)
 {
 }
 
@@ -24,22 +22,23 @@ AliHLTTRDCluster::AliHLTTRDCluster():
  * Main Constructor
  */
 //============================================================================
-AliHLTTRDCluster::AliHLTTRDCluster(AliTRDcluster * inCluster):
+AliHLTTRDCluster::AliHLTTRDCluster(const AliTRDcluster* const inCluster):
   fX (inCluster->GetX()),
   fY (inCluster->GetY()),
   fZ (inCluster->GetZ()),
-  fQ (inCluster->GetQ()),
-  fIsInChamber(inCluster->IsInChamber()),
-  fIsShared (inCluster->IsShared()),
-  fDetector (inCluster->GetDetector()),
-  fLocalTimeBin (inCluster->GetLocalTimeBin()),
-  fClusterMasking (inCluster->IsMasked()),
-  fPadCol (inCluster->GetPadCol()),
-  fPadRow (inCluster->GetPadRow()),
-  fPadTime ( inCluster->GetPadTime())
+  fDetector (inCluster->fDetector),
+  fLocalTimeBin (inCluster->fLocalTimeBin),
+  fClusterMasking (inCluster->fClusterMasking),
+  fPadCol (inCluster->fPadCol),
+  fPadRow (inCluster->fPadRow),
+  fPadTime (inCluster->fPadTime),
+  fBits(0)
 {
-  //  fNPads = inCluster->GetNPads();
-  //  fCenter = inCluster->GetCenter();
+
+  for(int i=0; i<3; i++)
+    fSignals[i]=inCluster->fSignals[i+2];
+
+  fBits = UInt_t(inCluster->TestBits(-1)) >> 14; 
 }
 
 
@@ -47,35 +46,32 @@ AliHLTTRDCluster::AliHLTTRDCluster(AliTRDcluster * inCluster):
  * Copy data to the output TRDcluster
  */
 //============================================================================
-void AliHLTTRDCluster::ExportTRDCluster(AliTRDcluster *outCluster)
+void AliHLTTRDCluster::ExportTRDCluster(AliTRDcluster* const outCluster) const
 {
-  //  Print();
   outCluster->SetX(fX);
   outCluster->SetY(fY);
   outCluster->SetZ(fZ);
-  outCluster->SetQ(fQ);
-  outCluster->SetInChamber(fIsInChamber);
-  outCluster->SetShared(fIsShared);
-  outCluster->SetDetector(fDetector);
-  outCluster->SetLocalTimeBin(fLocalTimeBin);
-  outCluster->SetClusterMasking(fClusterMasking);
+  outCluster->fDetector=fDetector;
+  outCluster->fLocalTimeBin=fLocalTimeBin;
+  outCluster->fClusterMasking=fClusterMasking;
+  outCluster->fPadCol=fPadCol;
+  outCluster->fPadRow=fPadRow;
+  outCluster->fPadTime=fPadTime;
+
+  for(int i=0; i<3; i++){
+    outCluster->fSignals[i+2]=fSignals[i];
+    outCluster->fQ+=fSignals[i];
+  }
 
-  outCluster->SetPadCol(fPadCol);
-  outCluster->SetPadRow(fPadRow);
-  outCluster->SetPadTime(fPadTime);
-  //  outCluster->SetNPads(fNPads);
-  //  outCluster->SetCenter(fCenter);
-  
-  
+  outCluster->SetBit(UInt_t(fBits)<<14);
 }
 
 /**
  * Prints main info about cluster
  */
 //============================================================================
-void AliHLTTRDCluster::Print()
+void AliHLTTRDCluster::Print() const
 {
-  //printf("   --hltCluster-- addr 0x%x(%i); sizeof(*this) %i\n", this, (int)this, this->GetSize());
-  //printf("     fX %f; fY %f; fZ %f\n",fX,fY,fZ);
-  
+  printf("   --hltCluster-- addr %p; sizeof(*this) %i\n", (void*)this, (int)sizeof(*this));
+  printf("     fX %f; fY %f; fZ %f\n",fX,fY,fZ);
 }