GeoDiamondSurface+GeoTrapezoidSurface: fixed cppcheck warnings

Logical conjunction always evaluates to false

Related to #119 (closed)

GeoModelCore/GeoModelKernel/GeoModelKernel/throwExcept.h

 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
-#ifndef GeoModelHelpers_THROWEXCEPT_H
-#define GeoModelHelpers_THROWEXCEPT_H
+#ifndef GEOMODELKERNEL_THROWEXCEPT_H
+#define GEOMODELKERNEL_THROWEXCEPT_H
 
 #include <exception>
 #include <sstream>
@@ -14,4 +14,4 @@
         except_str<<MESSAGE;                          \
         throw std::runtime_error(except_str.str());   \
     }
-#endif
\ No newline at end of file
+#endif