servalcat 0.4.72__cp312-cp312-macosx_11_0_arm64.whl → 0.4.99__cp312-cp312-macosx_11_0_arm64.whl

servalcat/xtal/twin.py

@@ -0,0 +1,121 @@
+"""
+Author: "Keitaro Yamashita, Garib N. Murshudov"
+MRC Laboratory of Molecular Biology
+    
+This software is released under the
+Mozilla Public License, version 2.0; see LICENSE.
+"""
+from __future__ import absolute_import, division, print_function, generators
+import argparse
+import gemmi
+import numpy
+import pandas
+from servalcat.utils import logger
+from servalcat import utils
+from servalcat import ext
+
+def find_twin_domains_from_data(hkldata, max_oblique=5, min_alpha=0.05):
+    logger.writeln("Finding possible twin operators from data")
+    ops = gemmi.find_twin_laws(hkldata.cell, hkldata.sg, max_oblique, False)
+    logger.writeln(f" {len(ops)} possible twin operator(s) found")
+    #for op in ops:
+    #    logger.writeln(f"  {op.triplet()}")
+    if not ops:
+        return
+    twin_data = ext.TwinData()
+    twin_data.setup(hkldata.miller_array(), hkldata.df.bin, hkldata.sg, hkldata.cell, ops)
+    if "I" in hkldata.df:
+        Io = hkldata.df.I.to_numpy()
+    else:
+        Io = hkldata.df.FP.to_numpy()**2
+    alphas = []
+    ccs, nums = [], []
+    for i_bin, bin_idxes in hkldata.binned():
+        ratios = [1.]
+        ccs.append([])
+        nums.append([])
+        for i_op, op in enumerate(ops):
+            ii = numpy.array(twin_data.pairs(i_op, i_bin))
+            val = numpy.all(numpy.isfinite(Io[ii]), axis=1)
+            if numpy.sum(val) == 0:
+                cc = numpy.nan
+            else:
+                cc = numpy.corrcoef(Io[ii][val].T)[0,1]
+            rr = (1 - numpy.sqrt(1 - cc**2)) / cc
+            ratios.append(rr)
+            ccs[-1].append(cc)
+            nums[-1].append(len(val))
+        alphas.append(numpy.array(ratios) / numpy.nansum(ratios))
+    alphas = numpy.maximum(0, numpy.mean(alphas, axis=0))
+    alphas /= numpy.nansum(alphas)
+    ccs = numpy.array(ccs)
+    nums = numpy.array(nums)
+    tmp = [{"Operator": gemmi.Op().triplet(),
+            "R_twin_obs": 0,
+            "CC_mean": 1,
+            "Alpha_from_CC": alphas[0]}]
+    for i_op, op in enumerate(ops):
+        ii = numpy.array(twin_data.pairs(i_op))
+        val = numpy.all(numpy.isfinite(Io[ii]), axis=1)
+        if numpy.sum(val) == 0:
+            r_obs = numpy.nan
+        else:
+            r_obs = numpy.sum(numpy.abs(Io[ii][val, 0] - Io[ii][val, 1])) / numpy.sum(Io[ii][val])
+        tmp.append({"Operator": op.triplet(),
+                    "CC_mean": numpy.sum(nums[:,i_op] * ccs[:,i_op]) / numpy.sum(nums[:,i_op]),
+                    "R_twin_obs": r_obs,
+                    "Alpha_from_CC": alphas[i_op+1],
+                    })
+    df = pandas.DataFrame(tmp)
+    logger.writeln(df.to_string(float_format="%.2f"))
+
+    sel_idxes = [i for i, a in enumerate(alphas) if i > 0 and a > min_alpha]
+    if not sel_idxes:
+        logger.writeln(" No twinning detected")
+        return
+    
+    if len(sel_idxes) + 1 != len(alphas):
+        ops = [ops[i-1] for i in sel_idxes]
+        logger.writeln(" Twin operators after filtering small fractions")
+        alphas = numpy.array([alphas[0]] + [alphas[i] for i in sel_idxes])
+        alphas /= numpy.sum(alphas)
+        df = pandas.DataFrame({"Operator": [x.triplet() for x in [gemmi.Op()]+ops],
+                               "Alpha": alphas})
+        logger.writeln(df.to_string(float_format="%.2f"))
+        twin_data = ext.TwinData()
+        twin_data.setup(hkldata.miller_array(), hkldata.df.bin, hkldata.sg, hkldata.cell, ops)
+    twin_data.alphas = alphas
+    if "I" not in hkldata.df:
+        logger.writeln('Generating "observed" intensities for twin refinement: Io = Fo**2, SigIo = 2*F*SigFo')
+        hkldata.df["I"] = hkldata.df.FP**2
+        hkldata.df["SIGI"] = 2 * hkldata.df.FP * hkldata.df.SIGFP
+    return twin_data
+
+# find_twin_domains_from_data()
+
+def estimate_twin_fractions_from_model(twin_data, hkldata):
+    logger.writeln("Estimating twin fractions")
+    Ic = numpy.abs(twin_data.f_calc.sum(axis=1))**2
+    Ic_all = Ic[twin_data.twin_related(hkldata.sg)]
+    rr = twin_data.obs_related_asu()
+    tmp = []
+    for i_bin, bin_idxes in hkldata.binned():
+        cc_o_c = []
+        i_tmp = Ic_all[numpy.asarray(twin_data.bin)==i_bin,:]
+        P = numpy.corrcoef(i_tmp.T)
+        iobs = hkldata.df.I.to_numpy()[bin_idxes]
+        ic_bin = Ic[rr[bin_idxes,:]]
+        val = numpy.isfinite(iobs) & numpy.isfinite(ic_bin).all(axis=1)
+        iobs, ic_bin = iobs[val], ic_bin[val,:]
+        cc_o_c = [numpy.corrcoef(iobs, ic_bin[:,i])[0,1] for i in range(len(twin_data.ops)+1)]
+        frac_est = numpy.dot(numpy.linalg.pinv(P), cc_o_c)
+        tmp.append(frac_est.tolist())
+
+    df = pandas.DataFrame(tmp)
+    df.iloc[:,:] /= df.sum(axis=1).to_numpy()[:,None]
+    mean_alphas = numpy.maximum(0, df.mean())
+    mean_alphas /= numpy.sum(mean_alphas)
+    logger.write(" Estimated fractions from data-model correlations: ")
+    logger.writeln(" ".join("%.2f"%x for x in mean_alphas))
+    twin_data.alphas = mean_alphas
+

{servalcat-0.4.72.dist-info → servalcat-0.4.99.dist-info}/METADATA

@@ -1,16 +1,16 @@
 Metadata-Version: 2.1
 Name: servalcat
-Version: 0.4.72
+Version: 0.4.99
 Summary: Structure refinement and validation for crystallography and single particle analysis
 Author: Keitaro Yamashita, Garib N. Murshudov
 License: MPL-2.0
 Project-URL: Repository, https://github.com/keitaroyam/servalcat
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Requires-Dist: packaging
 Requires-Dist: numpy>=1.15
 Requires-Dist: scipy
 Requires-Dist: pandas>=1.1.0
-Requires-Dist: gemmi==0.6.6
+Requires-Dist: gemmi==0.7.0
 Description-Content-Type: text/markdown
 
 # Servalcat
@@ -40,7 +40,7 @@ pip install servalcat
 ```
 will install the stable version.
 
-The required GEMMI version is now [v0.6.6](https://github.com/project-gemmi/gemmi/releases/tag/v0.6.6). It may not work with the latest gemmi code from the github. The policy is in the main branch I only push the code that works with the latest package of GEMMI.
+The required GEMMI version is now [v0.7.0](https://github.com/project-gemmi/gemmi/releases/tag/v0.7.0). It may not work with the latest gemmi code from the github. The policy is in the main branch I only push the code that works with the latest package of GEMMI.
 
 To use the Refmac5 related commands, you also need to install [CCP4](https://www.ccp4.ac.uk/). For "No Refmac5" commands, you may just need [the monomer library](https://github.com/MonomerLibrary/monomers) if CCP4 is not installed.
 

servalcat-0.4.99.dist-info/RECORD

@@ -0,0 +1,45 @@
+servalcat-0.4.99.dist-info/RECORD,,
+servalcat-0.4.99.dist-info/WHEEL,sha256=bS2kxwU1pioFffhNQmlfvjD0H1flBf5ZtxV4jDj8Nvc,114
+servalcat-0.4.99.dist-info/entry_points.txt,sha256=G1mDxhOCdF3umYz4k0kfwJbSdYSKqhvQdGCmrP8FRAY,111
+servalcat-0.4.99.dist-info/METADATA,sha256=OxT6LeODHswv4-Yg1Xtv6pjkvHjriRcZNFfq5asJObs,2741
+servalcat-0.4.99.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+servalcat/__init__.py,sha256=Wzar8K8OYk-xh70qv6hGajtSKjXH3qL93fHLMDTEh4w,231
+servalcat/ext.cpython-312-darwin.so,sha256=8LSy8m2v2-tK9zbONRrk2mHH2GVonTQNuKiQzGlJFdU,1219592
+servalcat/__main__.py,sha256=bNEZKrG5765uOp32UiBAJmeJi3O0sk4I5QjrXUbngIE,4070
+servalcat/refmac/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+servalcat/refmac/refmac_keywords.py,sha256=yzYSJELMjdTnf4pT0_8EdIOjCDncqkjpPJ3VNcsFDrU,26649
+servalcat/refmac/exte.py,sha256=HtmlTHRzCeCN-vSJZdKCD1GIhQO6zTe1OKLUObC3gZ8,9019
+servalcat/refmac/refmac_wrapper.py,sha256=euuhBv2F_ArmUvlfAA9fld4oCDkWMZENP73ioTtv118,17838
+servalcat/xtal/twin.py,sha256=lmBz0no9lfjq6MNkK9Q-9R47a0xGkDfaBYrOWunqyBI,4900
+servalcat/xtal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+servalcat/xtal/sigmaa.py,sha256=mTGKfjnrZGAee-TNZUovOd5mTCDZ10Xri8t2mY4l8Tg,75326
+servalcat/xtal/french_wilson.py,sha256=GE3WEPhuizDVSPq1Afyb1O-OPTlzKDXYhkDCIELWI_0,11787
+servalcat/xtal/run_refmac_small.py,sha256=Yg-bEPuOdQxCwdwY8StCvXabcWHrRl6A22gJgLsypeU,10394
+servalcat/utils/symmetry.py,sha256=ahMiaEDMyfV2YW0BkikF_ldMtIN4-usAGsNRCXGVbug,11869
+servalcat/utils/generate_operators.py,sha256=fCrcTcciRn-6fpFtHYvf1oPXAObjuqR3WQejz5d0RrA,10980
+servalcat/utils/maps.py,sha256=0hen0Pt9IxbGQOLZyZaGiNWBAttc6aMqb6NzrCKkZMQ,13225
+servalcat/utils/__init__.py,sha256=j-fMAqHvzyMMQXb2Sf7Urnk4oQ31pT-g_NXf3K-NM4c,1137
+servalcat/utils/logger.py,sha256=c84HQf7Hb1yzXZ3Syog0f5vNRnozl0OCpqi0qIMoBlY,4589
+servalcat/utils/model.py,sha256=wmwYUacysc9zAXIS807sNlZGpc2cjJIa5QvUQb7eEYU,30177
+servalcat/utils/restraints.py,sha256=V2QBfgSH636upbLtGany4QyBk3r05CLxqvJYiM1SLSQ,36960
+servalcat/utils/refmac.py,sha256=LKwgCtLg7R5D8mjI7yCGd2lrjcjTeEJVAo1pey2u3IU,30922
+servalcat/utils/commands.py,sha256=dxsbPMZl-1BVKKr0rXzGF08k-Aco5qwzEHRWxZlcxek,70956
+servalcat/utils/hkl.py,sha256=aH2SMAccU-cdBqSgUJ7O6D7PpzO7m_1HlRVzg9Q_4Ds,28062
+servalcat/utils/fileio.py,sha256=YytwlL0SeaxHCgIzFEjfS_tRpLDmvhVDjwEnkDXw1_E,29502
+servalcat/spa/shiftback.py,sha256=A9OfaZ8r2BC6A2uGXxNNhmyBNORUB_MeqJC29ZRebnw,4664
+servalcat/spa/localcc.py,sha256=0otKfGKH33cFsD6Qvh8iL1mINlWqb3gqAbVKqy8fQPY,7985
+servalcat/spa/translate.py,sha256=BwmVcyDbqDehjtH7kA4wQFF4hJb9c1gcHu7JbGREUTU,5099
+servalcat/spa/run_refmac.py,sha256=tX0a37-aTJgADZ_NCdKbT8aE4P9Bnmm1qrFW2jc9Hw4,49550
+servalcat/spa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+servalcat/spa/fsc.py,sha256=ISsBOl5JJZA6yT2yuDHNQ4I780TrmuYW6CPvimCwDqo,17454
+servalcat/spa/realspcc_from_var.py,sha256=VpdvNEY4zRza08Vz727JI6Seq-ix-oujx4Gvzy_VkYI,5275
+servalcat/spa/shift_maps.py,sha256=iP1w4LNXETvZblElJ64AFMcE-lPrhx1s4SfacGktg4o,13268
+servalcat/spa/fofc.py,sha256=Q97XkJX_4KWmxCIzq16R5BTMUY28V_4CPdbzF6p5Oxo,23113
+servalcat/refine/xtal.py,sha256=2Sr3sqO0nfIPNS4Ry_jmDimez3uRIWUsEExRC6ps1So,14617
+servalcat/refine/refine.py,sha256=W3oduNRNgc05mqMO1wYUdgN3pRrUuR9kEJ3yhAJd9jQ,44035
+servalcat/refine/refine_spa.py,sha256=Iq9lDvWC8IcOzHwx5FRylBUF3mb7YgtyzICsQTSm7Tw,19162
+servalcat/refine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+servalcat/refine/spa.py,sha256=lmh4P6nQNFIdaZUKFIc_ES6B6X-FG-JkxyfpqHgtk9g,6472
+servalcat/refine/cgsolve.py,sha256=tHuWXr76x4sRAMUQ4dGVJzyHF_n1LiwKHTjAwh8iFMg,3072
+servalcat/refine/refine_geom.py,sha256=uATaTCEVkPJw3DjpVX66j7mhYs9Mp21rDwBfumrpwfw,11352
+servalcat/refine/refine_xtal.py,sha256=DFy7FFRBP3fhcHl8JzI0FqBfdfAHE2vJNyH7kp9lXtQ,14736

{servalcat-0.4.72.dist-info → servalcat-0.4.99.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: scikit-build-core 0.9.5
+Generator: scikit-build-core 0.10.7
 Root-Is-Purelib: false
 Tag: cp312-cp312-macosx_11_0_arm64
 

servalcat-0.4.72.dist-info/RECORD

@@ -1,44 +0,0 @@
-servalcat-0.4.72.dist-info/RECORD,,
-servalcat-0.4.72.dist-info/WHEEL,sha256=mgQAlqZn1gpBQ0zqn0f5_muqckw_PxmecVM-Qtn7Mi0,113
-servalcat-0.4.72.dist-info/entry_points.txt,sha256=G1mDxhOCdF3umYz4k0kfwJbSdYSKqhvQdGCmrP8FRAY,111
-servalcat-0.4.72.dist-info/METADATA,sha256=TZYkYT2ZTIau48irzZGbtp_ceVKiJm0iTG0N8x5MPn8,2741
-servalcat-0.4.72.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-servalcat/__init__.py,sha256=FjeqVIsFlkCS8CNh8kLmauTGhRN3GKyJk1EzJT-OPa8,231
-servalcat/ext.cpython-312-darwin.so,sha256=wditWvvIiuQzxDlR8kWMDlBAJLHIGF2fOFfcfIe2qH8,1996232
-servalcat/__main__.py,sha256=bNEZKrG5765uOp32UiBAJmeJi3O0sk4I5QjrXUbngIE,4070
-servalcat/refmac/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-servalcat/refmac/refmac_keywords.py,sha256=0l04qPfsjTu8Ipr2e1JwnBsmnQws3iVB_E0cnnaMHdo,26512
-servalcat/refmac/exte.py,sha256=jlRBlNslSKPC0Gt6DZ4JFw1l9SqPDalsOv5E-5M5WN8,8847
-servalcat/refmac/refmac_wrapper.py,sha256=e404-q0cd8_NeIkLKC9lzfjKxS9GFqxPVSUwtNUyM3s,16658
-servalcat/xtal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-servalcat/xtal/sigmaa.py,sha256=y2bfLbesfdvi8KS3nuUkAa6CPdWNIPY73nrL2svZJTw,64792
-servalcat/xtal/french_wilson.py,sha256=Y90X8AwgnwOZ3sTyOD1IIAWaOV4g69zDym3CcIPJEw8,11073
-servalcat/xtal/run_refmac_small.py,sha256=Yg-bEPuOdQxCwdwY8StCvXabcWHrRl6A22gJgLsypeU,10394
-servalcat/utils/symmetry.py,sha256=H-5RBiQOp0MlWJE8LGJWvqe-YzmtzzrXfLO_2E_OpZU,11937
-servalcat/utils/generate_operators.py,sha256=fCrcTcciRn-6fpFtHYvf1oPXAObjuqR3WQejz5d0RrA,10980
-servalcat/utils/maps.py,sha256=ZoB3wwZZTLHYuwC4HBGFAYX4zmkZ8CdxD9wSLftL48c,13217
-servalcat/utils/__init__.py,sha256=j-fMAqHvzyMMQXb2Sf7Urnk4oQ31pT-g_NXf3K-NM4c,1137
-servalcat/utils/logger.py,sha256=oQcoKcM81fSsoQt_dKgwfUekJN5CcLMbti_kLb2loXM,3828
-servalcat/utils/model.py,sha256=cijlnPeMFIBHEQYw_CtJd2nPZXUXdsHN83h4vvelMRw,29841
-servalcat/utils/restraints.py,sha256=mpW-v08cGyX21FseO6AIB0babQznQpeRYwDqJWkfe8k,36032
-servalcat/utils/refmac.py,sha256=y18HZkpxG8pJPipCZJB3E25NiqrCpEqt_DFGuHHc3aw,30073
-servalcat/utils/commands.py,sha256=zkSFmdXIthC4ogvxgiHsVUyhBLZaiwflJAwP0CCBnZ8,64037
-servalcat/utils/hkl.py,sha256=H0QnnvXFqhmnzXAcCeCcPmpiKy7W5AOqVUmB-np4n3E,27765
-servalcat/utils/fileio.py,sha256=6znifeyHQ0warGJrLR6L0nCgryActgkSPzkmXEMRra8,28975
-servalcat/spa/shiftback.py,sha256=A9OfaZ8r2BC6A2uGXxNNhmyBNORUB_MeqJC29ZRebnw,4664
-servalcat/spa/localcc.py,sha256=0otKfGKH33cFsD6Qvh8iL1mINlWqb3gqAbVKqy8fQPY,7985
-servalcat/spa/translate.py,sha256=InePz9d38KaUK4wr8uk06_6v4y80T3HYcURWp8c21zM,5091
-servalcat/spa/run_refmac.py,sha256=gQE4I-x_hzcU6DlDq5xW47fVMaDoCR5GlpOfjiv5s2A,48591
-servalcat/spa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-servalcat/spa/fsc.py,sha256=qTz8nS_KJpno0s0Hw7Isp2n_6PDzaYkBye5zSnO3Ufg,17278
-servalcat/spa/realspcc_from_var.py,sha256=VpdvNEY4zRza08Vz727JI6Seq-ix-oujx4Gvzy_VkYI,5275
-servalcat/spa/shift_maps.py,sha256=iP1w4LNXETvZblElJ64AFMcE-lPrhx1s4SfacGktg4o,13268
-servalcat/spa/fofc.py,sha256=OvF1_wUcUzG4JLkRsCj-1ea2ukbQrc6ki01vI9aTISo,22188
-servalcat/refine/xtal.py,sha256=VnrGjWgRfj9ALGfHXgLIYswMwqsqe4vO7nsqrAFm8XA,11848
-servalcat/refine/refine.py,sha256=KAzc8NSmhGunFqJD6SWcliEwtXSPULHNNxJF4W2LMuA,38227
-servalcat/refine/refine_spa.py,sha256=HTzhmUkoxzxeY5qFlW6-Ryla7a0-TwiBWR6P3AaxjRs,17340
-servalcat/refine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-servalcat/refine/spa.py,sha256=-7O6a0-1YCfyRtlKbAT5sFseg7XkDTybt9uFC4vDVAQ,6194
-servalcat/refine/cgsolve.py,sha256=tHuWXr76x4sRAMUQ4dGVJzyHF_n1LiwKHTjAwh8iFMg,3072
-servalcat/refine/refine_geom.py,sha256=nWeHjWG3ieKP9JDUi-4XAxNpELIPuxawA59_PM-4W9o,10366
-servalcat/refine/refine_xtal.py,sha256=UEx1fYHk9p23AaWTFYg8P1_TUetLmouqPGfCLcjOufc,12595