GPU: Fix typo in determining nPagesFragmentMax, improve variable names and remove deprecated variable

davidrohr · davidrohr · commit b1e6b0203d42 · 2022-09-13T08:40:44.000+02:00
diff --git a/GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx b/GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx
@@ -219,7 +219,6 @@ std::pair<unsigned int, unsigned int> GPUChainTracking::TPCClusterizerDecodeZSCo
   }
   mCFContext->nPagesTotal += nPages;
   mCFContext->nPagesSector[iSlice] = nPages;
-  mCFContext->nPagesSectorMax = std::max(mCFContext->nPagesSectorMax, nPages);
 
   mCFContext->nDigitsEndpointMax[iSlice] = 0;
   for (unsigned int i = 0; i < GPUTrackingInOutZS::NENDPOINTS; i++) {
@@ -229,14 +228,14 @@ std::pair<unsigned int, unsigned int> GPUChainTracking::TPCClusterizerDecodeZSCo
   }
   unsigned int nDigitsFragmentMax = 0;
   for (unsigned int i = 0; i < mCFContext->nFragments; i++) {
-    unsigned int pages = 0;
-    unsigned int digits = 0;
+    unsigned int pagesInFragment = 0;
+    unsigned int digitsInFragment = 0;
     for (unsigned short j = 0; j < GPUTrackingInOutZS::NENDPOINTS; j++) {
-      pages += mCFContext->fragmentData[i].nPages[iSlice][j];
-      digits += mCFContext->fragmentData[i].nDigits[iSlice][j];
+      pagesInFragment += mCFContext->fragmentData[i].nPages[iSlice][j];
+      digitsInFragment += mCFContext->fragmentData[i].nDigits[iSlice][j];
     }
-    mCFContext->nPagesFragmentMax = std::max(mCFContext->nPagesSectorMax, pages);
-    nDigitsFragmentMax = std::max(nDigitsFragmentMax, digits);
+    mCFContext->nPagesFragmentMax = std::max(mCFContext->nPagesFragmentMax, pagesInFragment);
+    nDigitsFragmentMax = std::max(nDigitsFragmentMax, digitsInFragment);
   }
   mRec->getGeneralStepTimer(GeneralStep::Prepare).Stop();
   return {nDigits, nDigitsFragmentMax};
diff --git a/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFChainContext.h b/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFChainContext.h
@@ -44,7 +44,6 @@ struct GPUTPCCFChainContext {
   int zsVersion;
   std::vector<FragmentData> fragmentData;
   unsigned int nPagesTotal;
-  unsigned int nPagesSectorMax;
   unsigned int nPagesFragmentMax;
   unsigned int nPagesSector[GPUCA_NSLICES];
   unsigned int nDigitsEndpointMax[GPUCA_NSLICES];
@@ -59,7 +58,7 @@ struct GPUTPCCFChainContext {
   void prepare(bool tpcZS, const CfFragment& fragmentMax)
   {
     abandonTimeframe = false;
-    nPagesTotal = nPagesSectorMax = nPagesFragmentMax = 0;
+    nPagesTotal = nPagesFragmentMax = 0;
     for (unsigned int i = 0; i < GPUCA_NSLICES; i++) {
       nPagesSector[i] = 0;
       nDigitsEndpointMax[i] = 0;
