update of AltroChannelSelector component by Jason: added monitoring histograms, make...

[u/mrichter/AliRoot.git] / HLT / RCU / AliHLTAltroGenerator.cxx

diff --git a/HLT/RCU/AliHLTAltroGenerator.cxx b/HLT/RCU/AliHLTAltroGenerator.cxx
index 4d0d9081204f9be69aac79b186efe428f4c810e3..c7b00af09a4ffdaba0e17b5f808fd444eb1af99d 100644 (file)
--- a/HLT/RCU/AliHLTAltroGenerator.cxx
+++ b/HLT/RCU/AliHLTAltroGenerator.cxx
@@ -79,8 +79,6 @@ AliHLTAltroGenerator::~AliHLTAltroGenerator()
 int AliHLTAltroGenerator::Generate()
 {
   // see header file for class documentation
-  int iResult=0;
-
   if (!fpSimData) fpSimData=new TArrayS;
   if (!fpSimData) {
     return -ENOMEM;
@@ -136,7 +134,7 @@ int AliHLTAltroGenerator::Generate()
     // minus its length.
     // Data is now simulated in the right order in order to fullfil this check.
     for (bunch=0; bunch<nofBunches && bunchEndTime<fMaxTimebin-3; bunch++) {
-      while ((bunchEndTime+=GetRandom(0, fMaxTimebin-bunchEndTime))-lastBunchEndTime<3);
+      while ((bunchEndTime+=GetRandom(0, fMaxTimebin-bunchEndTime))-lastBunchEndTime<3) {/*empty body*/};
       int bunchLength=GetRandom(0, bunchEndTime-lastBunchEndTime<fMaxBunchLength?bunchEndTime-lastBunchEndTime:fMaxBunchLength);
       if (bunchLength==0) continue;
       totalBunches++;
@@ -176,10 +174,6 @@ int AliHLTAltroGenerator::Generate()
   }
 
   assert(fNof10BitWords%4==0);
-  if (iResult<0) {
-    fpSimData->Set(0);
-    return iResult;
-  }
   fpSimData->Set(dataPos);
   return GetDataSize();
 }
@@ -420,13 +414,13 @@ bool AliHLTAltroGenerator::Next()
   bool haveData=false;
   if (!fpSimData) return false;
   do {
-    if (haveData=(fCurrentTimeOffset>=0 &&
-                 fCurrentBunch>0 &&
-                 ++fCurrentTimeOffset<GetBunchSize())) {
+    if ((haveData=(fCurrentTimeOffset>=0 &&
+                  fCurrentBunch>0 &&
+                  ++fCurrentTimeOffset<GetBunchSize()))) {
       break;
     }
 
-    if (haveData=(NextBunch() && GetBunchSize()>0)) {
+    if ((haveData=(NextBunch()) && GetBunchSize()>0)) {
       fCurrentTimeOffset=0;
       break;
     }
@@ -452,7 +446,7 @@ bool AliHLTAltroGenerator::NextChannel()
 {
   // see header file for class documentation
   bool haveData=false;
-  if (fpSimData && fChannelPositions.size()==0) return false;
+  if (!fpSimData || fChannelPositions.size()==0) return false;
   fpSimData->GetArray();
   if (fCurrentPosition==-1) {
     if (fDirection==kForwards) fCurrentPosition=0;
@@ -499,7 +493,7 @@ bool AliHLTAltroGenerator::NextBunch()
     if (fDirection==kBackwards) {
       if (fCurrentBunch<0) {
        // bunch count in channel end - 1
-       if (haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fEnd-1))>0) {
+       if ((haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fEnd-1))>0)) {
          // first bunch length at channel end - 2
          fCurrentBunch=fChannelPositions[fCurrentPosition].fEnd-2;
        }
@@ -515,7 +509,7 @@ bool AliHLTAltroGenerator::NextBunch()
     } else if (fDirection==kForwards) {
       if (fCurrentBunch<0) {
        // bunch count in channel start + 1
-       if (haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fPosition+1))>0) {
+       if ((haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fPosition+1))>0)) {
          // first bunch length at channel start + 2
          fCurrentBunch=fChannelPositions[fCurrentPosition].fPosition+2;
        }