diff --git a/core/detectors/trd/CbmTrdParFasp.cxx b/core/detectors/trd/CbmTrdParFasp.cxx
index 1583ec3da964243497bc8a18ccf1d4cad6847182..89c94fc134b8b62d55da34123d12929c3545b78f 100644
--- a/core/detectors/trd/CbmTrdParFasp.cxx
+++ b/core/detectors/trd/CbmTrdParFasp.cxx
@@ -39,10 +39,10 @@ const CbmTrdParFaspChannel* CbmTrdParFasp::GetChannel(Int_t ch_address) const
 }
 
 //___________________________________________________________________
-bool CbmTrdParFasp::IsChannelMasked(int ch_address) const
+bool CbmTrdParFasp::IsChannelMasked(int chId) const
 {
-  if (ch_address < 0 || ch_address >= NFASPCH) return false;
-  return fCalib[ch_address].IsMasked();
+  if (chId < 0 || chId >= NFASPCH) return false;
+  return fCalib[chId].IsMasked();
 }
 
 //___________________________________________________________________
diff --git a/core/detectors/trd/CbmTrdParFasp.h b/core/detectors/trd/CbmTrdParFasp.h
index 5c5fd9dff831ae7c04b305b3fd4f58efa7a162fc..1c1bd319bc5cbdafd562c000cdde7be134268081 100644
--- a/core/detectors/trd/CbmTrdParFasp.h
+++ b/core/detectors/trd/CbmTrdParFasp.h
@@ -84,12 +84,22 @@ class CbmTrdParFasp : public CbmTrdParAsic {
 public:
   CbmTrdParFasp(Int_t address = 0, Int_t FebGrouping = -1, Double_t x = 0, Double_t y = 0, Double_t z = 0);
   virtual ~CbmTrdParFasp() { ; }
+  /** \brief Query the calibration for one FASP RO channel
+   * \param pad_address the index of the pad on the module [row*ncol+col]
+   * \param pair 0 for tilt and 1 for rect
+   */
   const CbmTrdParFaspChannel* GetChannel(Int_t pad_address, UChar_t pair) const;
-  const CbmTrdParFaspChannel* GetChannel(Int_t ch_address) const;
+  /** \brief Query the calibration for one FASP RO channel
+   * \param chId the index of the channel in the current FASP [0 - 15]
+   */
+  const CbmTrdParFaspChannel* GetChannel(Int_t chId) const;
   virtual Int_t GetNchannels() const { return NFASPCH; };
-  virtual Int_t GetChannelAddress(Int_t ich) const
+  /** \brief Return the global RO channel for curent FASP and channel index
+   * \param chId the index of the channel in the current FASP [0 - 15]
+   */
+  virtual Int_t GetChannelAddress(Int_t chId) const
   {
-    return ((ich < 0 || ich >= GetNchannels()) ? 0 : fChannelAddresses[ich]);
+    return ((chId < 0 || chId >= GetNchannels()) ? 0 : fChannelAddresses[chId]);
   }
   virtual uint32_t GetChannelMask() const;
   virtual bool IsChannelMasked(int ch) const;