backup

git-svn-id: svn+ssh://gitlab/srv/svn-repos/pdb-redo/trunk@193 a1961a4f-ab94-4bcc-80e8-33b5a54de466

include/cif++/AtomShape.h

+// AtomShape, analogue to the similarly named code in clipper
+
+#pragma once
+
+#include "cif++/Structure.h"
+
+namespace libcif
+{
+
+// --------------------------------------------------------------------
+// Class used in calculating radii
+
+class AtomShape
+{
+  public:
+	AtomShape(const Atom& atom, float resHigh, float resLow);
+
+	float radius() const;
+
+  private:
+	AtomType	mSymbol;
+	int			mCharge;
+	float		mUIso, mOccupancy;
+	float		mResHigh, mResLow;
+};
+	
+}

include/cif++/AtomType.h

@@ -196,6 +196,18 @@ class AtomTypeTraits
 			throw std::invalid_argument("invalid radius requested");
 			throw std::invalid_argument("invalid radius requested");
 		return mInfo->radii[type] / 100.f;
 		return mInfo->radii[type] / 100.f;
 	}
 	}
+	
+	// data type encapsulating the Waasmaier & Kirfel scattering factors
+	// in a simplified form (only a and b).
+	struct WKSF
+	{
+		double a[6], b[6];
+	};
+	
+	// to get the Cval and Siva values, use this constant as charge:
+	enum { kWKSFVal = -99 };
+	
+	const WKSF& wksf(int charge = 0) const;
 
 
   private:
   private:
 	const struct AtomTypeInfo*	mInfo;
 	const struct AtomTypeInfo*	mInfo;

include/cif++/ResolutionCalculator.h

+// Lib for working with structures as contained in mmCIF and PDB files
+
+#pragma once
+
+#include "cif++/ResolutionCalculator.h"
+
+namespace libcif
+{
+
+// --------------------------------------------------------------------
+
+class ResolutionCalculator
+{
+  public:
+	ResolutionCalculator(double a, double b, double c,
+		double alpha, double beta, double gamma);
+	
+	double operator()(int h, int k, int l) const
+	{
+		double tmpres = h * h * mCoefs[0] + h * k * mCoefs[1] +
+					    h * l * mCoefs[2] + k * k * mCoefs[3] +
+					    k * l * mCoefs[4] + l * l * mCoefs[5];
+		
+		return 1.0 / std::sqrt(tmpres);
+	}
+	
+  private:
+	double	mCoefs[6];
+};
+
+}

include/cif++/Structure.h

@@ -125,6 +125,10 @@ class Atom
 	// get clipper format Atom
 	// get clipper format Atom
 	clipper::Atom toClipper() const;
 	clipper::Atom toClipper() const;
 
 
+	// Radius calculation based on integrating the density until perc of electrons is found
+	void calculateRadius(float resHigh, float resLow, float perc);
+	float radius() const;
+
   private:
   private:
  	struct AtomImpl*			mImpl;
  	struct AtomImpl*			mImpl;
 };
 };

src/AtomShape.cpp

+// Lib for working with structures as contained in file and PDB files
+
+#include "cif++/Structure.h"
+#include "cif++/AtomShape.h"
+#include "cif++/Point.h"
+
+#include <newuoa.h>
+
+using namespace std;
+
+namespace libcif
+{
+
+
+namespace {
+
+// --------------------------------------------------------------------
+
+template <class F>
+NewuoaClosure make_closure(F &function) {
+    struct Wrap {
+        static double call(void *data, long n, const double *values) {
+            return reinterpret_cast<F *>(data)->operator()(n, values);
+        }
+    };
+    return NewuoaClosure {&function, &Wrap::call};
+}
+
+// --------------------------------------------------------------------
+
+// sine integration function based on the description in
+//	GalSim: The modular galaxy image simulation toolkit
+//	B.T.P. Rowe et. al.
+//	DOI: 10.1016/j.ascom.2015.02.002
+
+double SineIntegration(double x)
+{
+	struct P { double n, d; };
+	double result = 0;
+	
+	if (x <= 4)
+	{
+		const P kP[] =
+		{
+			{	1,							1,						},
+			{	-4.54393409816329991e-2,	1.01162145739225565e-2	},
+			{	1.15457225751016682e-3,		4.99175116169755106e-5	},
+			{	-1.41018536821330254e-5,	1.55654986308745614e-7	},
+			{	9.43280809438713025e-8,		3.28067571055789734e-10	},
+			{	-3.53201978997168357e-10,	4.5049097575386581e-13	},
+			{	7.08240282274875911e-13,	3.21107051193712168e-16	},
+			{	-6.05338212010422477e-16,	0						}
+		};
+		
+		double xs = x * x;
+		double xi = 1;
+		double sn = 0, sd = 0;
+		
+		for (auto p: kP)
+		{
+			sn += xi * p.n;
+			sd += xi * p.d;
+			xi *= xs;
+		}
+
+		result = x * (sn / sd);
+	}	
+	else
+	{
+		const P
+			kF[] = 
+			{
+				{ 1,                          1,                           },
+				{ 7.44437068161936700618e2,   7.46437068161927678031e2,    },
+				{ 1.96396372895146869801e5,   1.97865247031583951450e5,    },
+				{ 2.37750310125431834034e7,   2.41535670165126845144e7,    },
+				{ 1.43073403821274636888e9,   1.47478952192985464958e9,    },
+				{ 4.33736238870432522765e10,  4.58595115847765779830e10,   },
+				{ 6.40533830574022022911e11,  7.08501308149515401563e11,   },
+				{ 4.20968180571076940208e12,  5.06084464593475076774e12,   },
+				{ 1.00795182980368574617e13,  1.43468549171581016479e13,   },
+				{ 4.94816688199951963482e12,  1.11535493509914254097e13,   },
+				{ -4.94701168645415959931e11, 0                            }
+			},
+			kG[] = {
+				{ 1,                         1,                              },
+				{ 8.1359520115168615e2,      8.19595201151451564e2,          },
+				{ 2.35239181626478200e5,     2.40036752835578777e5,          },
+				{ 3.12557570795778731e7,     3.26026661647090822e7,          },
+				{ 2.06297595146763354e9,     2.23355543278099360e9,          },
+				{ 6.83052205423625007e10,    7.87465017341829930e10,         },
+				{ 1.09049528450362786e12,    1.39866710696414565e12,         },
+				{ 7.57664583257834349e12,    1.17164723371736605e13,         },
+				{ 1.81004487464664575e13,    4.01839087307656620e13,         },
+				{ 6.43291613143049485e12,    3.99653257887490811e13,         },
+				{ -1.36517137670871689e12,   0                               }
+			};
+		
+		double xs = pow(x, -2);
+		double xi = 1;
+		
+		double sn = 0, sd = 0;
+		for (auto p: kF)
+		{
+			sn += xi * p.n;
+			sd += xi * p.d;
+			xi *= xs;
+		}
+		
+		double fx = (sn / sd) / x;
+		
+		sn = 0;
+		sd = 0;
+		xi = 1;
+		for (auto p : kG)
+		{
+			sn += xi * p.n;
+			sd += xi * p.d;
+			xi *= xs;
+		}
+		
+		double gx = (sn / sd) / (x * x);
+		
+		result = libcif::kPI / 2 - fx * cos(x) - gx * sin(x);
+	}
+	
+	return result;
+}
+
+// --------------------------------------------------------------------
+// Internal class to cache some common data
+
+class DensityIntegration
+{
+  public:
+	DensityIntegration(float resolutionLow, float resolutionHigh);
+
+	double IntegrateRadius(float perc, AtomType symbol, int charge,
+		float uIso, float occupancy) const;
+	double IntegrateDensity(double r, int ks, const vector<double>& fst) const;
+	
+	tuple<double,vector<double>> InitData(AtomType symbol, int charge,
+		float uIso, float occupancy) const;
+
+  private:
+	float	mA, mB;
+	int		mM;
+
+	// Gauss-Legendre quadrature weights and abscissae
+	vector<double>	mWA, mST, mSTS;
+};
+
+DensityIntegration::DensityIntegration(float resolutionLow, float resolutionHigh)
+{
+	mA = 0.5f / resolutionLow;
+	mB = 0.5f / resolutionHigh;
+	
+	mM = static_cast<int>(12.0 * sqrt(1.2 * mB) + 1);
+	if (mM < 3)
+		mM = 3;
+	
+	int N = 2 * mM;
+//	int J = N;
+	double xr = mB - mA;
+	double xh = .5 * xr;
+	double xm = 0.5 * (mB + mA);
+
+	mWA = vector<double>(N, 0);
+	mST = vector<double>(N, 0);
+	mSTS = vector<double>(N, 0);
+	
+	for (int i = 1, j = N; i <= mM; ++i, --j)
+	{
+		double z, zo, dp;
+		
+		z = cos(libcif::kPI * (i - 0.25) / (N + 0.5));
+
+		do
+		{
+			double p1 = 1;
+			double p2 = 0;
+
+			for (int k = 1; k <= N; ++k)
+			{
+				double p3 = p2;
+				p2 = p1;
+				p1 = ((2 * k - 1) * z * p2 - (k - 1) * p3) / k;
+			}
+			
+			dp = N * (z * p1 - p2) / (z * z - 1);
+			zo = z;
+			z = z - p1 / dp;
+		}
+		while (abs(z - zo) > 3e-14);
+			
+		mWA[i - 1] = xr / ((1 - z * z) * dp * dp);
+		mWA[j - 1] = mWA[i - 1];
+		mST[i - 1] = xm - xh * z;
+		mST[j - 1] = xm + xh * z;
+	}
+
+	transform(mST.begin(), mST.end(), mSTS.begin(), [](double s) { return s * s; });
+}
+
+// --------------------------------------------------------------------
+
+tuple<double,vector<double>> DensityIntegration::InitData(AtomType symbol, int charge,
+		float uIso, float occupancy) const
+{
+	double yi = 0;
+	vector<double> fst(mST.size(), 0);
+
+	auto& D = AtomTypeTraits(symbol).wksf(charge);
+	auto bIso = clipper::Util::u2b(uIso);
+	
+	for (int i = 0; i < 6; ++i)
+	{
+		double bi = D.b[i] + bIso;
+		yi += D.a[i] * (exp(-bi * mA * mA) - exp(-bi * mB * mB)) / bi;
+	}
+	
+	for (size_t i = 0; i < mST.size(); ++i)
+	{
+		double t = 0;
+		for (int j = 0; j < 6; ++j)
+		{
+			double bj = D.b[j] + bIso;
+			t += D.a[j] * exp(-bj * mSTS[i]);
+		}
+
+		fst[i] = occupancy * mWA[i] * t * mST[i];
+	}
+
+	return make_tuple(yi, fst);
+}
+
+// --------------------------------------------------------------------
+// Calculate Radius integral over r of calculated density
+// code inspired by radint.f in edstats
+
+double DensityIntegration::IntegrateDensity(double r, int ks, const vector<double>& fst) const
+{
+	double y = 0;
+	
+	double rt = r;
+	if (rt < 0)
+		rt = 0;
+	
+	if (rt > 1e-10)
+	{
+		double t = 4 * libcif::kPI * rt;
+		y = 0;
+		
+		for (int i = 0; i < mST.size(); ++i)
+			y += fst[i] * SineIntegration(t * mST[i]);
+		
+		if (r < 0)
+			y = y - ks * r;
+	}
+	
+	return ks * y;
+}
+
+double DensityIntegration::IntegrateRadius(float perc, AtomType symbol, int charge,
+	float uIso, float occupancy) const
+{
+	// Initilialise parameters
+	
+	double yi;
+	vector<double> fst;
+	
+	tie(yi, fst) = InitData(symbol, charge, uIso, occupancy);
+	
+	double yt = perc * 0.25 * libcif::kPI * occupancy * yi;
+	double initialValue = 0.25;
+	
+
+	// code from newuoa-example
+    const long variables_count = 1;
+    const long number_of_interpolation_conditions = (variables_count + 1)*(variables_count + 2)/2;
+    double variables_values[] = { initialValue };
+    const double initial_trust_region_radius = 1e-3;
+    const double final_trust_region_radius = 1e3;
+    const long max_function_calls_count = 100;
+    const size_t working_space_size = NEWUOA_WORKING_SPACE_SIZE(variables_count,
+                                                                number_of_interpolation_conditions);
+    double working_space[working_space_size];
+
+    auto function = [&] (long n, const double *x)
+    {
+		assert(n == 1);
+		return this->IntegrateDensity(x[0], -1, fst);
+    };
+    auto closure = make_closure(function);
+
+    double result = newuoa_closure(
+            &closure,
+            variables_count,
+            number_of_interpolation_conditions,
+            variables_values,
+            initial_trust_region_radius,
+            final_trust_region_radius,
+            max_function_calls_count,
+            working_space);
+
+    // 
+    
+    const double kRE = 5e-5;
+    
+    double y1 = 0;
+    double y2 = -result;
+    double x1 = 0;
+    double x2 = variables_values[0];
+    
+    if (y2 > yt)
+    {
+	    for (int it = 0; it < 100; ++it)
+	    {
+	    	double x = 0.5 * (x1 + x2);
+	    	double y = IntegrateDensity(x, 1, fst);
+	    	
+	    	if (abs(y - yt) < kRE * abs(yt))
+	    	{
+	    		result = x;
+	    		break;
+	    	}
+	    	
+	    	if ((y1 < yt and y < yt) or (y1 > yt and y > yt))
+	    	{
+	    		x1 = x;
+	    		y1 = y;
+	    	}
+	    	else
+	    	{
+	    		x2 = x;
+	    		y2 = y;
+	    	}
+	    }
+    }
+    else
+    	result = x2;
+
+	return result;
+}
+
+
+
+} // namespace
+	
+AtomShape::AtomShape(const Atom& atom, float resHigh, float resLow)
+	: mSymbol(atom.type())
+	, mCharge(atom.charge())
+	, mUIso(atom.uIso())
+	, mOccupancy(atom.occupancy())
+	, mResHigh(resHigh)
+	, mResLow(resLow)
+{
+}
+
+float AtomShape::radius() const
+{
+	DensityIntegration di(mResLow, mResHigh);
+	
+	return di.IntegrateRadius(0.95, mSymbol, mCharge, mUIso, mOccupancy);
+}
+
+
+}

src/ResolutionCalculator.cpp

+// --------------------------------------------------------------------
+
+#include "cif++/ResolutionCalculator.h"
+
+using namespace std;
+
+namespace libcif
+{
+
+ResolutionCalculator::ResolutionCalculator(double a, double b, double c,
+		double alpha, double beta, double gamma)
+{
+	double deg2rad = atan(1.0) / 45.0;
+	
+	double ca = cos(deg2rad * alpha);
+	double sa = sin(deg2rad * alpha);
+	double cb = cos(deg2rad * beta);
+	double sb = sin(deg2rad * beta);
+	double cg = cos(deg2rad * gamma);
+	double sg = sin(deg2rad * gamma);
+	
+	double cast = (cb * cg - ca) / (sb * sg);
+	double cbst = (cg * ca - cb) / (sg * sa);
+	double cgst = (ca * cb - cg) / (sa * sb);
+	
+	double sast = sqrt(1 - cast * cast);
+	double sbst = sqrt(1 - cbst * cbst);
+	double sgst = sqrt(1 - cgst * cgst);
+
+	double ast = 1 / (a * sb * sgst);
+	double bst = 1 / (b * sg * sast);
+	double cst = 1 / (c * sa * sbst);
+	
+	mCoefs[0] = ast * ast;
+	mCoefs[1] = 2 * ast * bst * cgst;
+	mCoefs[2] = 2 * ast * cst * cbst;
+	mCoefs[3] = bst * bst;
+	mCoefs[4] = 2 * bst * cst * cast;
+	mCoefs[5] = cst * cst;
+}
+
+}

src/Structure.cpp

@@ -11,6 +11,7 @@
 #include "cif++/PDB2Cif.h"
 #include "cif++/PDB2Cif.h"
 #include "cif++/CifParser.h"
 #include "cif++/CifParser.h"
 #include "cif++/Cif2PDB.h"
 #include "cif++/Cif2PDB.h"
+#include "cif++/AtomShape.h"
 
 
 using namespace std;
 using namespace std;
 
 
@@ -258,6 +259,11 @@ struct AtomImpl
 		return mCompound != nullptr and mCompound->isWater();
 		return mCompound != nullptr and mCompound->isWater();
 	}
 	}
 
 
+	float radius() const
+	{
+		return mRadius;
+	}
+
 	const File&			mFile;
 	const File&			mFile;
 	string				mId;
 	string				mId;
 	int					mRefcount;
 	int					mRefcount;
@@ -265,6 +271,7 @@ struct AtomImpl
 	const Compound*		mCompound;
 	const Compound*		mCompound;
 	Point				mLocation;
 	Point				mLocation;
 	AtomType			mType;
 	AtomType			mType;
+	float				mRadius = nan("4");
 	
 	
 //	const entity&		mEntity;
 //	const entity&		mEntity;
 //	std::string			mAsymId;
 //	std::string			mAsymId;
@@ -421,6 +428,21 @@ clipper::Atom Atom::toClipper() const
 	return mImpl->toClipper();
 	return mImpl->toClipper();
 }
 }
 
 
+void Atom::calculateRadius(float resHigh, float resLow, float perc)
+{
+	AtomShape shape(*this, resHigh, resLow);
+	mImpl->mRadius = shape.radius();
+
+	// verbose
+	if (VERBOSE > 1)
+		cout << "Calculated radius for " << AtomTypeTraits(mImpl->mType).name() << " with charge " << charge() << " is " << mImpl->mRadius << endl;
+}
+
+float Atom::radius() const
+{
+	return mImpl->mRadius;
+}
+
 // --------------------------------------------------------------------
 // --------------------------------------------------------------------
 // residue
 // residue