Fix symmetry lookup

include/cif++/Symmetry.hpp

@@ -37,6 +37,11 @@ namespace mmcif
 
 
 // --------------------------------------------------------------------
 // --------------------------------------------------------------------
 
 
+enum class SpacegroupName
+{
+	full, xHM, Hall
+};
+
 struct Spacegroup
 struct Spacegroup
 {
 {
 	const char* name;
 	const char* name;
@@ -133,6 +138,7 @@ CIFPP_EXPORT extern const std::size_t kSymopNrTableSize;
 
 
 // --------------------------------------------------------------------
 // --------------------------------------------------------------------
 
 
-int GetSpacegroupNumber(std::string spacegroup);	// alternative for clipper's parsing code
+int GetSpacegroupNumber(std::string spacegroup);						// alternative for clipper's parsing code, using SpacegroupName::full
+int GetSpacegroupNumber(std::string spacegroup, SpacegroupName type);	// alternative for clipper's parsing code
 
 
 }
 }

src/Structure.cpp

@@ -317,13 +317,15 @@ struct AtomImpl
 		auto cat = mDb.get("atom_site_anisotrop");
 		auto cat = mDb.get("atom_site_anisotrop");
 		if (cat)
 		if (cat)
 		{
 		{
-			auto r = cat->find1(cif::Key("id") == mID);
-
-			if (not r.empty())
+			try
 			{
 			{
-				result = true;
+				auto r = cat->find1(cif::Key("id") == mID);
 				cif::tie(anisou[0], anisou[1], anisou[2], anisou[3], anisou[4], anisou[5]) =
 				cif::tie(anisou[0], anisou[1], anisou[2], anisou[3], anisou[4], anisou[5]) =
 					r.get("U[1][1]", "U[1][2]", "U[1][3]", "U[2][2]", "U[2][3]", "U[3][3]");
 					r.get("U[1][1]", "U[1][2]", "U[1][3]", "U[2][2]", "U[2][3]", "U[3][3]");
+				result = true;
+			}
+			catch(const std::exception& e)
+			{
 			}
 			}
 		}
 		}
 
 

src/Symmetry.cpp

@@ -90,4 +90,66 @@ int GetSpacegroupNumber(std::string spacegroup)
 	return result;
 	return result;
 }
 }
 
 
+// --------------------------------------------------------------------
+
+int GetSpacegroupNumber(std::string spacegroup, SpacegroupName type)
+{
+	if (spacegroup == "P 21 21 2 A")
+		spacegroup = "P 21 21 2 (a)";
+	else if (spacegroup.empty())
+		throw std::runtime_error("No spacegroup, cannot continue");
+
+	int result = 0;
+
+	if (type == SpacegroupName::full)
+	{
+		const size_t N = kNrOfSpaceGroups;
+		int32_t L = 0, R = static_cast<int32_t>(N - 1);
+		while (L <= R)
+		{
+			int32_t i = (L + R) / 2;
+
+			int d = spacegroup.compare(kSpaceGroups[i].name);
+
+			if (d > 0)
+				L = i + 1;
+			else if (d < 0)
+				R = i - 1;
+			else
+			{
+				result = kSpaceGroups[i].nr;
+				break;
+			}
+		}
+	}
+	else if (type == SpacegroupName::xHM)
+	{
+		for (auto &sg : kSpaceGroups)
+		{
+			if (sg.xHM == spacegroup)
+			{
+				result = sg.nr;
+				break;
+			}
+		}
+	}
+	else
+	{
+		for (auto &sg : kSpaceGroups)
+		{
+			if (sg.Hall == spacegroup)
+			{
+				result = sg.nr;
+				break;
+			}
+		}
+	}
+
+	// not found, see if we can find a match based on xHM name
+	if (result == 0)
+		throw std::runtime_error("Spacegroup name " + spacegroup + " was not found in table");
+	
+	return result;
+}
+
 }
 }