diff --git a/core/detectors/trd/CbmTrdRadiator.cxx b/core/detectors/trd/CbmTrdRadiator.cxx
index acf493dcb3965467b86635dfe9583a460c628c13..b05fbb338ce08193ff32933be35db17ff0684bfa 100644
--- a/core/detectors/trd/CbmTrdRadiator.cxx
+++ b/core/detectors/trd/CbmTrdRadiator.cxx
@@ -13,7 +13,7 @@
 
 #include <Logger.h>  // for Logger, LOG
 
-#include <TDirectory.h>  // for TDirectory
+#include <TDirectory.h>   // for TDirectory
 #include <TFile.h>        // for TFile, gFile
 #include <TGeoManager.h>  // for TGeoManager, gGeoManager
 #include <TH1.h>          // for TH1D
@@ -700,7 +700,7 @@ Int_t CbmTrdRadiator::TRspectrum()
 
   SetSigma(1);
 
-  Float_t stemp = 0;
+  //Float_t stemp = 0;
 
   // Loop over energy
   // stemp is the total energy of all created photons
@@ -739,7 +739,7 @@ Int_t CbmTrdRadiator::TRspectrum()
     // save the result
     fSpectrum->SetBinContent(iBin + 1, wn);
     // compute the integral
-    stemp += wn;
+    //stemp += wn;
   }
 
   // <nTR> (binsize corr.)
@@ -765,7 +765,7 @@ Int_t CbmTrdRadiator::WinTRspectrum()
 
   SetSigma(2);
 
-  Float_t stemp = 0;
+  //Float_t stemp = 0;
   for (Int_t iBin = 0; iBin < fSpNBins; iBin++) {
 
     Float_t sp = 0;
@@ -779,7 +779,7 @@ Int_t CbmTrdRadiator::WinTRspectrum()
 
     fWinSpectrum->SetBinContent(iBin + 1, wn);
 
-    stemp += wn;
+    //stemp += wn;
   }
 
   //fnTRprod = stemp * fSpBinWidth;
@@ -799,7 +799,7 @@ Int_t CbmTrdRadiator::DetTRspectrum()
   //
 
   SetSigma(3);
-  Float_t stemp  = 0;
+  //Float_t stemp  = 0;
   Float_t stemp2 = 0;
   for (Int_t iBin = 0; iBin < fSpNBins; iBin++) {
 
@@ -810,7 +810,7 @@ Int_t CbmTrdRadiator::DetTRspectrum()
     Float_t wn   = sp * conv;
 
     fDetSpectrum->SetBinContent(iBin + 1, wn);
-    stemp += wn;
+    //stemp += wn;
 
     // absorbed spectrum
     Float_t conv2 = 1 - TMath::Exp(-fSigmaDet[iBin]);
diff --git a/sim/detectors/trd/CbmTrdModuleSimR.cxx b/sim/detectors/trd/CbmTrdModuleSimR.cxx
index dd86d07ae4b15da95572eb0b90fba5efc7096bf3..cfb1e3547f3ce75cb7a51da18c48650cccd1c4ef 100644
--- a/sim/detectors/trd/CbmTrdModuleSimR.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSimR.cxx
@@ -1364,7 +1364,6 @@ void CbmTrdModuleSimR::ScanPadPlane(const Double_t* local_point, Double_t reldri
     if (fnScanRowConst > 0) maxRow = fnScanRowConst;
 
     Int_t startRow(rowId - maxRow / 2);
-    Double_t sum = 0;
     Int_t secRow(-1), targCol(-1), targRow(-1), targSec(-1), address(-1), fnRow(fDigiPar->GetNofRows()),
       fnCol(fDigiPar->GetNofColumns());
 
@@ -1404,8 +1403,6 @@ void CbmTrdModuleSimR::ScanPadPlane(const Double_t* local_point, Double_t reldri
       chargeFraction =
         CalcPRF((iCol - columnId) * W - displacement_x, W, h) * CalcPRF((iRow - rowId) * H - displacement_y, H, h);
 
-      sum += chargeFraction;
-
       ch = chargeFraction * clusterELoss;
       tr = chargeFraction * clusterELossTR;
 
@@ -1450,7 +1447,6 @@ void CbmTrdModuleSimR::ScanPadPlane(const Double_t* local_point, Double_t reldri
 
           chargeFraction = CalcPRF(((iCol - collow) - columnId) * W - displacement_x, W, h)
                            * CalcPRF((iRow - rowId) * H - displacement_y, H, h);
-          sum += chargeFraction;
           ch = chargeFraction * clusterELoss;
           tr = chargeFraction * clusterELossTR;
 
@@ -1523,7 +1519,6 @@ void CbmTrdModuleSimR::ScanPadPlane(const Double_t* local_point, Double_t reldri
 
           chargeFraction = CalcPRF(((iCol + colhigh) - columnId) * W - displacement_x, W, h)
                            * CalcPRF((iRow - rowId) * H - displacement_y, H, h);
-          sum += chargeFraction;
           ch = chargeFraction * clusterELoss;
           tr = chargeFraction * clusterELossTR;
 
diff --git a/sim/detectors/trd/CbmTrdRawToDigiR.cxx b/sim/detectors/trd/CbmTrdRawToDigiR.cxx
index 6aaa07f7f021c419624a8a420f5409ddb4bc4f2e..cce707eafb8cc4bb524b9ef84f12a97d723a8af5 100644
--- a/sim/detectors/trd/CbmTrdRawToDigiR.cxx
+++ b/sim/detectors/trd/CbmTrdRawToDigiR.cxx
@@ -474,9 +474,9 @@ Double_t CbmTrdRawToDigiR::GetCharge(std::vector<Int_t> samples, Int_t shift)
       for (size_t i = 0; i < fSampleMask.size(); i++) {
         samplesum += samples[fSampleMask[i]];
       }
-      if (shift > -1) charge = fElookupSmall[shift][samples[fMaxBin]];
+      if (shift > -1) charge = fElookupSmall[shift][samplesum];
       else
-        charge = fElookupSmall[fElookupAsym[samples[fMaxBin]][samples[fMinBin]][samples[fHighBin]]][samples[fMaxBin]];
+        charge = fElookupSmall[fElookupAsym[samples[fMaxBin]][samples[fMinBin]][samples[fHighBin]]][samplesum];
     }
     else {
       return 0.;