ITSMFT: ITS3: fix asserts in TopoDict

f3sch · f3sch · commit 04802d49a62b · 2026-05-20T10:34:48.000+02:00
Signed-off-by: Felix Schlepper &lt;felix.schlepper@cern.ch&gt;
diff --git a/DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TopologyDictionary.h b/DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TopologyDictionary.h
@@ -92,67 +92,67 @@ class TopologyDictionary
   /// Returns the x position of the COG for the n_th element
   inline float getXCOG(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mXCOG;
   }
   /// Returns the error on the x position of the COG for the n_th element
   inline float getErrX(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mErrX;
   }
   /// Returns the z position of the COG for the n_th element
   inline float getZCOG(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mZCOG;
   }
   /// Returns the error on the z position of the COG for the n_th element
   inline float getErrZ(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mErrZ;
   }
   /// Returns the error^2 on the x position of the COG for the n_th element
   inline float getErr2X(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mErr2X;
   }
   /// Returns the error^2 on the z position of the COG for the n_th element
   inline float getErr2Z(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mErr2Z;
   }
   /// Returns the hash of the n_th element
   inline unsigned long getHash(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mHash;
   }
   /// Returns the number of fired pixels of the n_th element
   inline int getNpixels(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mNpixels;
   }
   /// Returns the frequency of the n_th element;
   inline double getFrequency(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mFrequency;
   }
   /// Returns true if the element corresponds to a group of rare topologies
   inline bool isGroup(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mIsGroup;
   }
   /// Returns the pattern of the topology
   inline const ClusterPattern& getPattern(int n) const
   {
-    assert(n >= 0 || n < (int)mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)mVectorOfIDs.size());
     return mVectorOfIDs[n].mPattern;
   }
 
diff --git a/Detectors/Upgrades/ITS3/reconstruction/include/ITS3Reconstruction/TopologyDictionary.h b/Detectors/Upgrades/ITS3/reconstruction/include/ITS3Reconstruction/TopologyDictionary.h
@@ -65,77 +65,77 @@ class TopologyDictionary
   [[nodiscard]] float getXCOG(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mXCOG;
   }
   /// Returns the error on the x position of the COG for the n_th element
   [[nodiscard]] float getErrX(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mErrX;
   }
   /// Returns the z position of the COG for the n_th element
   [[nodiscard]] float getZCOG(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mZCOG;
   }
   /// Returns the error on the z position of the COG for the n_th element
   [[nodiscard]] float getErrZ(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mErrZ;
   }
   /// Returns the error^2 on the x position of the COG for the n_th element
   [[nodiscard]] float getErr2X(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mErr2X;
   }
   /// Returns the error^2 on the z position of the COG for the n_th element
   [[nodiscard]] float getErr2Z(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mErr2Z;
   }
   /// Returns the hash of the n_th element
   [[nodiscard]] unsigned long getHash(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mHash;
   }
   /// Returns the number of fired pixels of the n_th element
   [[nodiscard]] int getNpixels(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mNpixels;
   }
   /// Returns the frequency of the n_th element;
   [[nodiscard]] double getFrequency(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mFrequency;
   }
   /// Returns true if the element corresponds to a group of rare topologies
   [[nodiscard]] bool isGroup(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mIsGroup;
   }
   /// Returns the pattern of the topology
   [[nodiscard]] const itsmft::ClusterPattern& getPattern(int n, bool IB = true) const
   {
     const auto& data = (IB) ? mDataIB : mDataOB;
-    assert(n >= 0 || n < (int)data.mVectorOfIDs.size());
+    assert(n >= 0 && n < (int)data.mVectorOfIDs.size());
     return data.mVectorOfIDs[n].mPattern;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -92,67 +92,67 @@ class TopologyDictionary`
`92`	`92`	`/// Returns the x position of the COG for the n_th element`
`93`	`93`	`inline float getXCOG(int n) const`
`94`	`94`	`{`
`95`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`95`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`96`	`96`	`return mVectorOfIDs[n].mXCOG;`
`97`	`97`	`}`
`98`	`98`	`/// Returns the error on the x position of the COG for the n_th element`
`99`	`99`	`inline float getErrX(int n) const`
`100`	`100`	`{`
`101`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`101`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`102`	`102`	`return mVectorOfIDs[n].mErrX;`
`103`	`103`	`}`
`104`	`104`	`/// Returns the z position of the COG for the n_th element`
`105`	`105`	`inline float getZCOG(int n) const`
`106`	`106`	`{`
`107`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`107`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`108`	`108`	`return mVectorOfIDs[n].mZCOG;`
`109`	`109`	`}`
`110`	`110`	`/// Returns the error on the z position of the COG for the n_th element`
`111`	`111`	`inline float getErrZ(int n) const`
`112`	`112`	`{`
`113`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`113`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`114`	`114`	`return mVectorOfIDs[n].mErrZ;`
`115`	`115`	`}`
`116`	`116`	`/// Returns the error^2 on the x position of the COG for the n_th element`
`117`	`117`	`inline float getErr2X(int n) const`
`118`	`118`	`{`
`119`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`119`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`120`	`120`	`return mVectorOfIDs[n].mErr2X;`
`121`	`121`	`}`
`122`	`122`	`/// Returns the error^2 on the z position of the COG for the n_th element`
`123`	`123`	`inline float getErr2Z(int n) const`
`124`	`124`	`{`
`125`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`125`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`126`	`126`	`return mVectorOfIDs[n].mErr2Z;`
`127`	`127`	`}`
`128`	`128`	`/// Returns the hash of the n_th element`
`129`	`129`	`inline unsigned long getHash(int n) const`
`130`	`130`	`{`
`131`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`131`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`132`	`132`	`return mVectorOfIDs[n].mHash;`
`133`	`133`	`}`
`134`	`134`	`/// Returns the number of fired pixels of the n_th element`
`135`	`135`	`inline int getNpixels(int n) const`
`136`	`136`	`{`
`137`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`137`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`138`	`138`	`return mVectorOfIDs[n].mNpixels;`
`139`	`139`	`}`
`140`	`140`	`/// Returns the frequency of the n_th element;`
`141`	`141`	`inline double getFrequency(int n) const`
`142`	`142`	`{`
`143`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`143`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`144`	`144`	`return mVectorOfIDs[n].mFrequency;`
`145`	`145`	`}`
`146`	`146`	`/// Returns true if the element corresponds to a group of rare topologies`
`147`	`147`	`inline bool isGroup(int n) const`
`148`	`148`	`{`
`149`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`149`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`150`	`150`	`return mVectorOfIDs[n].mIsGroup;`
`151`	`151`	`}`
`152`	`152`	`/// Returns the pattern of the topology`
`153`	`153`	`inline const ClusterPattern& getPattern(int n) const`
`154`	`154`	`{`
`155`		`- assert(n >= 0 \|\| n < (int)mVectorOfIDs.size());`
	`155`	`+ assert(n >= 0 && n < (int)mVectorOfIDs.size());`
`156`	`156`	`return mVectorOfIDs[n].mPattern;`
`157`	`157`	`}`
`158`	`158`
Original file line number	Diff line number	Diff line change
`@@ -65,77 +65,77 @@ class TopologyDictionary`
`65`	`65`	`[[nodiscard]] float getXCOG(int n, bool IB = true) const`
`66`	`66`	`{`
`67`	`67`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`68`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`68`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`69`	`69`	`return data.mVectorOfIDs[n].mXCOG;`
`70`	`70`	`}`
`71`	`71`	`/// Returns the error on the x position of the COG for the n_th element`
`72`	`72`	`[[nodiscard]] float getErrX(int n, bool IB = true) const`
`73`	`73`	`{`
`74`	`74`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`75`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`75`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`76`	`76`	`return data.mVectorOfIDs[n].mErrX;`
`77`	`77`	`}`
`78`	`78`	`/// Returns the z position of the COG for the n_th element`
`79`	`79`	`[[nodiscard]] float getZCOG(int n, bool IB = true) const`
`80`	`80`	`{`
`81`	`81`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`82`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`82`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`83`	`83`	`return data.mVectorOfIDs[n].mZCOG;`
`84`	`84`	`}`
`85`	`85`	`/// Returns the error on the z position of the COG for the n_th element`
`86`	`86`	`[[nodiscard]] float getErrZ(int n, bool IB = true) const`
`87`	`87`	`{`
`88`	`88`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`89`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`89`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`90`	`90`	`return data.mVectorOfIDs[n].mErrZ;`
`91`	`91`	`}`
`92`	`92`	`/// Returns the error^2 on the x position of the COG for the n_th element`
`93`	`93`	`[[nodiscard]] float getErr2X(int n, bool IB = true) const`
`94`	`94`	`{`
`95`	`95`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`96`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`96`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`97`	`97`	`return data.mVectorOfIDs[n].mErr2X;`
`98`	`98`	`}`
`99`	`99`	`/// Returns the error^2 on the z position of the COG for the n_th element`
`100`	`100`	`[[nodiscard]] float getErr2Z(int n, bool IB = true) const`
`101`	`101`	`{`
`102`	`102`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`103`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`103`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`104`	`104`	`return data.mVectorOfIDs[n].mErr2Z;`
`105`	`105`	`}`
`106`	`106`	`/// Returns the hash of the n_th element`
`107`	`107`	`[[nodiscard]] unsigned long getHash(int n, bool IB = true) const`
`108`	`108`	`{`
`109`	`109`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`110`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`110`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`111`	`111`	`return data.mVectorOfIDs[n].mHash;`
`112`	`112`	`}`
`113`	`113`	`/// Returns the number of fired pixels of the n_th element`
`114`	`114`	`[[nodiscard]] int getNpixels(int n, bool IB = true) const`
`115`	`115`	`{`
`116`	`116`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`117`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`117`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`118`	`118`	`return data.mVectorOfIDs[n].mNpixels;`
`119`	`119`	`}`
`120`	`120`	`/// Returns the frequency of the n_th element;`
`121`	`121`	`[[nodiscard]] double getFrequency(int n, bool IB = true) const`
`122`	`122`	`{`
`123`	`123`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`124`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`124`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`125`	`125`	`return data.mVectorOfIDs[n].mFrequency;`
`126`	`126`	`}`
`127`	`127`	`/// Returns true if the element corresponds to a group of rare topologies`
`128`	`128`	`[[nodiscard]] bool isGroup(int n, bool IB = true) const`
`129`	`129`	`{`
`130`	`130`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`131`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`131`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`132`	`132`	`return data.mVectorOfIDs[n].mIsGroup;`
`133`	`133`	`}`
`134`	`134`	`/// Returns the pattern of the topology`
`135`	`135`	`[[nodiscard]] const itsmft::ClusterPattern& getPattern(int n, bool IB = true) const`
`136`	`136`	`{`
`137`	`137`	`const auto& data = (IB) ? mDataIB : mDataOB;`
`138`		`- assert(n >= 0 \|\| n < (int)data.mVectorOfIDs.size());`
	`138`	`+ assert(n >= 0 && n < (int)data.mVectorOfIDs.size());`
`139`	`139`	`return data.mVectorOfIDs[n].mPattern;`
`140`	`140`	`}`
`141`	`141`