diff --git a/reco/detectors/tof/CbmTofClusterizersDef.h b/reco/detectors/tof/CbmTofClusterizersDef.h
index dfc2a9f7f25b8f278651df374d17bcf73ef5122e..83f5c9692329563a6632e73d99d54ed8a59d6ebc 100644
--- a/reco/detectors/tof/CbmTofClusterizersDef.h
+++ b/reco/detectors/tof/CbmTofClusterizersDef.h
@@ -34,8 +34,12 @@ const Int_t iNTrg = 1;
  * From CbmTofTestBeamClusterizer.cxx
  */
 const Double_t dDoubleMax = 1.E300;
-const Int_t DetMask       = 0x003FFFFF;
-const Int_t ModMask       = 0x0000FFFF;
+/*
+const Int_t DetMask       = 0x003FFFFF; // geo v14a
+const Int_t ModMask       = 0x0000FFFF; // geo v14a
+*/
+const Int_t DetMask       = 0x001FFFFF; // geo v21a
+const Int_t ModMask       = 0x0000FFFF; // geo v21a
 
 /*
 Int_t iNevtBuild=0; // Should be class member!