diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
index cdc1f7e82cd7f962dbbfb8651121fb509cc1605c..0fbc0228ad16881272d1d9db5696a13aaeeb5e60 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
@@ -470,7 +470,7 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, nsL1vector<E
       S0 = S1 = S2 = S3 = S4 = S5 = S6 = S7 = 0.0;
       for (THitIndex ih = 0; ih < MaxSearchAreaSize; ih++) {
         ENNSearchHitV& sHit = SearchArea[ih];
-        const fvec w        = mask2int(SearchArea[ih].on_ring);
+        const fvec w        = iif(SearchArea[ih].on_ring, fvec::One(), fvec::Zero());
         S0 += w * sHit.S0;
         S1 += w * sHit.S1;
         S2 += w * sHit.S2;
@@ -532,7 +532,7 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, nsL1vector<E
         validHit = validHit & ( d <= HitSize );
         ringV.chi2 += d*d;
         ringV.localIHits.push_back( iif( validHit, sHit.localIndex, fvec(-1.) ) );
-        ringV.NHits += mask2int(validHit);
+        ringV.NHits += iif(validHit, fvec::One(), fvec::Zero());
         validHit = validHit & ( d <= ShadowSize ); // TODO check *4
         if ( validHit.isEmpty() ) continue; // CHECKME
         Shadow.push_back( iif( validHit, sHit.localIndex, fvec(-1.) ) );
@@ -548,7 +548,7 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, nsL1vector<E
         if ( validHit.isEmpty() ) continue;
         ringV.chi2 += d*d;
         ringV.localIHits.push_back( iif( validHit, puHit.localIndex, fvec(-1.) ) );
-        ringV.NHits += mask2int(validHit);
+        ringV.NHits += iif(validHit, fvec::One(), fvec::Zero());
         validHit = validHit & ( d <= ShadowSize ); // TODO check *4
         if ( validHit.isEmpty() ) continue; // CHECKME
         Shadow.push_back( iif( validHit, puHit.localIndex, fvec(-1.) ) );
diff --git a/reco/L1/ParticleFinder/CbmL1PFFitter.cxx b/reco/L1/ParticleFinder/CbmL1PFFitter.cxx
index 270268c0964436cf1e8c3f82c840b0082b8d9d16..d3c53cb8bdc9729ca765d8a230f4891ec5ccaa96 100644
--- a/reco/L1/ParticleFinder/CbmL1PFFitter.cxx
+++ b/reco/L1/ParticleFinder/CbmL1PFFitter.cxx
@@ -498,7 +498,7 @@ void CbmL1PFFitter::GetChiToVertex(vector<CbmStsTrack>& Tracks, vector<L1FieldRe
 
     for (int iSt = nStations - 4; iSt >= 0; iSt--) {
 
-      fvec w = mask2int(T.z > (zSta[iSt] + 2.5));
+      fvec w = iif(T.z > (zSta[iSt] + 2.5), fvec::One(), fvec::Zero());
 
       L1Extrapolate(T, zSta[iSt], T.qp, fld, &w);
       if (iSt == NMvdStations - 1) {
diff --git a/reco/L1/vectors/L1vecPseudo.h b/reco/L1/vectors/L1vecPseudo.h
index 4ae66719092336612a4abaa573f3118d56f3a123..e4130b84a7d9a657006a4ae1876b76acc2192e95 100644
--- a/reco/L1/vectors/L1vecPseudo.h
+++ b/reco/L1/vectors/L1vecPseudo.h
@@ -268,11 +268,6 @@ public:
 
 inline fvec fabs(const fvec& a) { return abs(a); }
 
-inline fvec mask2int(const fmask& mask)
-{  // mask returned
-  return iif(mask, fvec::One(), fvec::Zero());
-}
-
 /// Checks, if all bands are equal
 /// NOTE: two values defined as signaling_NaN() are not equal, thus if there are all or one
 /// of the words are kNaN, the function returns false
diff --git a/reco/L1/vectors/L1vecVc.h b/reco/L1/vectors/L1vecVc.h
index 48e074ecfc7642f60f43c5204c29990596b8f656..1ff387d535606d98e4144de30354e1503b77f74e 100644
--- a/reco/L1/vectors/L1vecVc.h
+++ b/reco/L1/vectors/L1vecVc.h
@@ -29,10 +29,10 @@ inline fvec operator-(const fvec& a, fscal b) { return a - fvec(b); }
 
 inline fvec fabs(const fvec& a) { return abs(a); }
 
-inline fvec mask2int(const fmask& mask)
-{  // mask returned
-  return iif(mask, fvec::One(), fvec::Zero());
-}
+//inline fvec mask2int(const fmask& mask)
+//{  // mask returned
+//return iif(mask, fvec::One(), fvec::Zero());
+//}
 
 /// Checks, if all bands are equal
 /// NOTE: two values defined as signaling_NaN() are not equal, thus if there are all or one