- cleaning up debug output

[u/mrichter/AliRoot.git] / HLT / CALO / AliHLTCaloClusterizer.cxx

diff --git a/HLT/CALO/AliHLTCaloClusterizer.cxx b/HLT/CALO/AliHLTCaloClusterizer.cxx
index 2cb92d1e457c51f35e9b3a748ef965557777fce6..e21c56114890f7b1c1e65cef023ecaed74cd936d 100644 (file)
--- a/HLT/CALO/AliHLTCaloClusterizer.cxx
+++ b/HLT/CALO/AliHLTCaloClusterizer.cxx
@@ -71,7 +71,6 @@ AliHLTCaloClusterizer::AliHLTCaloClusterizer(TString det):
   fAvailableSize = sizeof(AliHLTCaloRecPointDataStruct) * 20;\r
   fRecPointDataPtr = reinterpret_cast<AliHLTCaloRecPointDataStruct*>(new UChar_t[fAvailableSize]);\r
   fFirstRecPointPtr = fRecPointDataPtr;  \r
   fAvailableSize = sizeof(AliHLTCaloRecPointDataStruct) * 20;\r
   fRecPointDataPtr = reinterpret_cast<AliHLTCaloRecPointDataStruct*>(new UChar_t[fAvailableSize]);\r
   fFirstRecPointPtr = fRecPointDataPtr;  \r

-  printf("Start of rec point data: %x, end of rec point data: %x\n", fRecPointDataPtr, reinterpret_cast<UChar_t*>(fRecPointDataPtr) + fAvailableSize);\r

 \r
 }//end\r
 \r
 \r
 }//end\r
 \r


@@ -100,14 +99,14 @@ AliHLTCaloClusterizer::ClusterizeEvent(Int_t nDigits)
   for(Int_t i = 0; i < nDigits; i++)\r
     { \r
       fDigitsInCluster = 0;\r
   for(Int_t i = 0; i < nDigits; i++)\r
     { \r
       fDigitsInCluster = 0;\r

-      //      printf("ENERGY: %f\n", fDigitsPointerArray[i]->fEnergy);\r
+\r

       if(fDigitsPointerArray[i]->fEnergy < fEmcClusteringThreshold)\r
        {\r
          continue;\r
        }\r
       CheckArray();\r
       CheckBuffer();\r
       if(fDigitsPointerArray[i]->fEnergy < fEmcClusteringThreshold)\r
        {\r
          continue;\r
        }\r
       CheckArray();\r
       CheckBuffer();\r

-      //            printf("` candidate!\n");\r
+\r

       // First digit is placed at the fDigits member variable in the recpoint\r
       fDigitIndexPtr = &(fRecPointDataPtr->fDigits);\r
       fUsedSize += sizeof(AliHLTCaloRecPointDataStruct);\r
       // First digit is placed at the fDigits member variable in the recpoint\r
       fDigitIndexPtr = &(fRecPointDataPtr->fDigits);\r
       fUsedSize += sizeof(AliHLTCaloRecPointDataStruct);\r


@@ -117,7 +116,6 @@ AliHLTCaloClusterizer::ClusterizeEvent(Int_t nDigits)
 \r
       // Assigning the digit to this rec point\r
       fRecPointDataPtr->fDigits = i;\r
 \r
       // Assigning the digit to this rec point\r
       fRecPointDataPtr->fDigits = i;\r

-      printf("Clusterizier: adding digit:  index pointer: %x, index: %d\n", fDigitIndexPtr, *fDigitIndexPtr);\r

       fUsedSize += sizeof(AliHLTCaloRecPointDataStruct);\r
       \r
       // Incrementing the pointer to be ready for new entry\r
       fUsedSize += sizeof(AliHLTCaloRecPointDataStruct);\r
       \r
       // Incrementing the pointer to be ready for new entry\r


@@ -137,8 +135,6 @@ AliHLTCaloClusterizer::ClusterizeEvent(Int_t nDigits)
       //fUsedSize += sizeof(AliHLTCaloRecPointDataStruct) + (fDigitsInCluster-1)*sizeof(AliHLTCaloDigitDataStruct);   \r
       \r
       fRecPointDataPtr->fMultiplicity = fDigitsInCluster;     \r
       //fUsedSize += sizeof(AliHLTCaloRecPointDataStruct) + (fDigitsInCluster-1)*sizeof(AliHLTCaloDigitDataStruct);   \r
       \r
       fRecPointDataPtr->fMultiplicity = fDigitsInCluster;     \r

-      printf("Rec point energy: %f\n", fRecPointDataPtr->fAmp);\r
-      printf("Multiplicity: %d\n", fDigitsInCluster);\r

       fRecPointArray[fNRecPoints] = fRecPointDataPtr; \r
       \r
       fRecPointDataPtr = reinterpret_cast<AliHLTCaloRecPointDataStruct*>(fDigitIndexPtr);\r
       fRecPointArray[fNRecPoints] = fRecPointDataPtr; \r
       \r
       fRecPointDataPtr = reinterpret_cast<AliHLTCaloRecPointDataStruct*>(fDigitIndexPtr);\r


@@ -182,11 +178,9 @@ AliHLTCaloClusterizer::ScanForNeighbourDigits(Int_t index, AliHLTCaloRecPointDat
 //                  }  \r
                  CheckBuffer();\r
                  // Assigning index to digit\r
 //                  }  \r
                  CheckBuffer();\r
                  // Assigning index to digit\r

-                 printf("Digit index pointer: %x\n", fDigitIndexPtr);\r

                  *fDigitIndexPtr = j;\r
                  fUsedSize += sizeof(Int_t);\r
                  \r
                  *fDigitIndexPtr = j;\r
                  fUsedSize += sizeof(Int_t);\r
                  \r

-                 printf("Clusterizier: adding digit:  index pointer: %x, index: %d\n", fDigitIndexPtr, *fDigitIndexPtr); \r

                  // Incrementing digit pointer to be ready for new entry\r
                  fDigitIndexPtr++;\r
 \r
                  // Incrementing digit pointer to be ready for new entry\r
                  fDigitIndexPtr++;\r
 \r


@@ -247,10 +241,8 @@ AliHLTCaloClusterizer::AreNeighbours(AliHLTCaloDigitDataStruct* digit1,
 \r
 Int_t AliHLTCaloClusterizer::CheckArray()\r
 {\r
 \r
 Int_t AliHLTCaloClusterizer::CheckArray()\r
 {\r

-      printf("CheckArray: fArraySize: %d, fNRecPoints: %d\n", fArraySize, fNRecPoints);\r

       if(fArraySize == fNRecPoints)\r
        {\r
       if(fArraySize == fNRecPoints)\r
        {\r

-          printf("Expanding array...");\r

           fArraySize *= 2;\r
           AliHLTCaloRecPointDataStruct **tmp = new AliHLTCaloRecPointDataStruct*[fArraySize];\r
           memcpy(tmp, fRecPointArray, fArraySize/2 * sizeof(AliHLTCaloRecPointDataStruct*));\r
           fArraySize *= 2;\r
           AliHLTCaloRecPointDataStruct **tmp = new AliHLTCaloRecPointDataStruct*[fArraySize];\r
           memcpy(tmp, fRecPointArray, fArraySize/2 * sizeof(AliHLTCaloRecPointDataStruct*));\r


@@ -263,10 +255,8 @@ Int_t AliHLTCaloClusterizer::CheckArray()
 Int_t AliHLTCaloClusterizer::CheckBuffer()\r
 {\r
    // See header file for class documentation \r
 Int_t AliHLTCaloClusterizer::CheckBuffer()\r
 {\r
    // See header file for class documentation \r

-        printf("CheckBuffer: Used size %d, fAvailableSize: %d\n", fUsedSize, fAvailableSize);\r
-       if((fAvailableSize - fUsedSize) < sizeof(AliHLTCaloRecPointDataStruct) )\r
+       if((fAvailableSize - fUsedSize) < sizeof(AliHLTCaloRecPointDataStruct))\r

        {\r
        {\r

-          printf("Expanding buffer...\n");\r

            Int_t recPointOffset = reinterpret_cast<UChar_t*>(fRecPointDataPtr) - reinterpret_cast<UChar_t*>(fFirstRecPointPtr);\r
            fAvailableSize *= 2;\r
            UChar_t *tmp = new UChar_t[fAvailableSize];\r
            Int_t recPointOffset = reinterpret_cast<UChar_t*>(fRecPointDataPtr) - reinterpret_cast<UChar_t*>(fFirstRecPointPtr);\r
            fAvailableSize *= 2;\r
            UChar_t *tmp = new UChar_t[fAvailableSize];\r


@@ -301,7 +291,6 @@ Int_t AliHLTCaloClusterizer::CheckDigits(AliHLTCaloRecPointDataStruct** recArray
   {\r
      nRecPoints = fNRecPoints;\r
   }\r
   {\r
      nRecPoints = fNRecPoints;\r
   }\r

-  printf("CL: CheckDigits: Number of rec points: %d\n", nRecPoints);\r

   for(Int_t i = 0; i < nRecPoints; i++)\r
   {\r
           \r
   for(Int_t i = 0; i < nRecPoints; i++)\r
   {\r
           \r


@@ -310,23 +299,16 @@ Int_t AliHLTCaloClusterizer::CheckDigits(AliHLTCaloRecPointDataStruct** recArray
      //AliHLTCaloRecPointDataStruct *recPoint = fRecPointArray[0];\r
      Int_t multiplicity = recPoint->fMultiplicity;\r
      Int_t *digitIndexPtr = &(recPoint->fDigits);\r
      //AliHLTCaloRecPointDataStruct *recPoint = fRecPointArray[0];\r
      Int_t multiplicity = recPoint->fMultiplicity;\r
      Int_t *digitIndexPtr = &(recPoint->fDigits);\r

-     printf("CL: Rec point with energy: %f, multiplicity: %d\n", recPoint->fAmp, recPoint->fMultiplicity);\r

      for(Int_t j = 0; j < multiplicity; j++)\r
      {\r
        //AliHLTCaloRecPointDataStruct *recPoint = fRecPointArray[j];\r
      for(Int_t j = 0; j < multiplicity; j++)\r
      {\r
        //AliHLTCaloRecPointDataStruct *recPoint = fRecPointArray[j];\r

-       AliHLTCaloDigitDataStruct *digit = digits[*digitIndexPtr];\r
-       printf("CL: Digit ID: %d, energy: %f, index: %d, indexpointer: %x\n", digit->fID, digit->fEnergy, *digitIndexPtr, digitIndexPtr);\r
+//     AliHLTCaloDigitDataStruct *digit = digits[*digitIndexPtr];\r

        digitIndexPtr++;\r
        //recPoint = reinterpret_cast<AliHLTCaloRecPointDataStruct*>(digitIndexPtr);\r
      }\r
   }\r
      \r
        digitIndexPtr++;\r
        //recPoint = reinterpret_cast<AliHLTCaloRecPointDataStruct*>(digitIndexPtr);\r
      }\r
   }\r
      \r

-     \r
-     \r
-     \r
-     \r
-     \r
-     \r
+     return 0;\r

 }\r
 \r
 Int_t AliHLTCaloClusterizer::CheckDigits(AliHLTCaloRecPointDataStruct** recArray, AliHLTCaloDigitDataStruct* digitArray, Int_t nRP)\r
 }\r
 \r
 Int_t AliHLTCaloClusterizer::CheckDigits(AliHLTCaloRecPointDataStruct** recArray, AliHLTCaloDigitDataStruct* digitArray, Int_t nRP)\r


@@ -343,7 +325,6 @@ Int_t AliHLTCaloClusterizer::CheckDigits(AliHLTCaloRecPointDataStruct** recArray
   {\r
      nRecPoints = fNRecPoints;\r
   }\r
   {\r
      nRecPoints = fNRecPoints;\r
   }\r

-  printf("CL: CheckDigits: Number of rec points: %d\n", nRecPoints);\r

   for(Int_t i = 0; i < nRecPoints; i++)\r
   {\r
           \r
   for(Int_t i = 0; i < nRecPoints; i++)\r
   {\r
           \r


@@ -352,22 +333,14 @@ Int_t AliHLTCaloClusterizer::CheckDigits(AliHLTCaloRecPointDataStruct** recArray
      //AliHLTCaloRecPointDataStruct *recPoint = fRecPointArray[0];\r
      Int_t multiplicity = recPoint->fMultiplicity;\r
      Int_t *digitIndexPtr = &(recPoint->fDigits);\r
      //AliHLTCaloRecPointDataStruct *recPoint = fRecPointArray[0];\r
      Int_t multiplicity = recPoint->fMultiplicity;\r
      Int_t *digitIndexPtr = &(recPoint->fDigits);\r

-     printf("CL: Rec point with energy: %f, multiplicity: %d\n", recPoint->fAmp, recPoint->fMultiplicity);\r

      for(Int_t j = 0; j < multiplicity; j++)\r
      {\r
        //AliHLTCaloRecPointDataStruct *recPoint = fRecPointArray[j];\r
        AliHLTCaloDigitDataStruct digit = digits[*digitIndexPtr];\r
      for(Int_t j = 0; j < multiplicity; j++)\r
      {\r
        //AliHLTCaloRecPointDataStruct *recPoint = fRecPointArray[j];\r
        AliHLTCaloDigitDataStruct digit = digits[*digitIndexPtr];\r

-       printf("CL: digits: %x, recpoints: %x, digitIndexPtr: %x\n", digits, recpoints, digitIndexPtr);\r
-       printf("CL: Digit ID: %d, energy: %f, index: %d, indexpointer: %x\n", digit.fID, digit.fEnergy, *digitIndexPtr, digitIndexPtr);\r

        digitIndexPtr++;\r
        //recPoint = reinterpret_cast<AliHLTCaloRecPointDataStruct*>(digitIndexPtr);\r
      }\r
   }\r
        digitIndexPtr++;\r
        //recPoint = reinterpret_cast<AliHLTCaloRecPointDataStruct*>(digitIndexPtr);\r
      }\r
   }\r

-     \r
-     \r
-     \r
-     \r
-     \r
-     \r
+   return 0;\r

      \r
 }
\ No newline at end of file
      \r
 }
\ No newline at end of file