Skip to content

Commit 8e8a68c

Browse files
vincefnvincefn
committed
Merge branch 'master' of https://github.com/vincefn/objcryst into upstream-objcryst
2 parents f60cf2e + c5ea86c commit 8e8a68c

22 files changed

+385
-808
lines changed

‎ChangeLog.txt

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1-
#### 2020.1 (January 2021)
1+
#### 2022.1 (May 2022)
22
NEW FEATURES
33
* Add cylindrical absorption correction (mu*R)
44
* Access to Crystallography Open Database now uses an http access without
55
need for MySQL, and should work through firewalls
6+
* Added more internal functions for the pyobjcryst Python interface.
7+
See https://pyobjcryst.readthedocs.io/en/latest/examples/index.html
68

79
IMPROVEMENTS
10+
* Improve indexing: use the integrated goodness-of-fit based on P1 integration
11+
intervals as a default indicator, normalised by the number of reflections
12+
used (* nb_refl / nb_refl_P1)
813
* Switched to wxWidgets 3.1
914
* When using --cif2pattern, do not convert atoms to a Molecule (faster)
1015
* Fox grid allows a working directory with spaces in the path.
16+
* In the XML output, the atom list inside a RigidGroup will now be
17+
valid XML. NB: older Fox versions will not be able to read correctly
18+
the list of atoms inside the group.
1119

1220
BUG FIXES
1321
* Correct EstimateCellVolume estimation for orthorombic F
22+
* Correct calculation of integrated figures of merit (Rwp, etc..)
23+
with multiple crystalline phases (https://github.com/vincefn/objcryst/pull/53)
1424
* + several minor issues
1525

1626
#### 2017.2 (28 June 2017)

‎Fox/Fox.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
BF3EB05508968F5500E02367 /* uctbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF3EB05408968F5500E02367 /* uctbx.cpp */; };
143143
BF3EB063089690D200E02367 /* spoil_optimization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF3EB062089690D200E02367 /* spoil_optimization.cpp */; };
144144
BF49CDF01B0BC56E0012BF3B /* covalent_radii.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF49CDEF1B0BC56E0012BF3B /* covalent_radii.cpp */; };
145+
BF5EBF13283F8CB2000D09FE /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5EBF12283F8CB2000D09FE /* QuartzCore.framework */; };
145146
BF69C4D1124F8C310035CF57 /* FoxClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF69C4C8124F8C310035CF57 /* FoxClient.cpp */; };
146147
BF69C4D2124F8C310035CF57 /* FoxJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF69C4C9124F8C310035CF57 /* FoxJob.cpp */; };
147148
BF69C4D3124F8C310035CF57 /* FoxServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF69C4CA124F8C310035CF57 /* FoxServer.cpp */; };
@@ -156,7 +157,6 @@
156157
BFE729E5243A6A7000BABE40 /* libwx_osx_cocoau-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.1.a */; };
157158
BFE729E6243A6A7300BABE40 /* libwxjpeg-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C11478047800799F7A /* libwxjpeg-3.1.a */; };
158159
BFE729E7243A6A7600BABE40 /* libwxpng-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C21478047800799F7A /* libwxpng-3.1.a */; };
159-
BFE729E8243A6A7900BABE40 /* libwxregexu-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C31478047800799F7A /* libwxregexu-3.1.a */; };
160160
BFFB474E0E5E0E620027591E /* wxLSQ.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFFB474D0E5E0E620027591E /* wxLSQ.cpp */; };
161161
BFFCCB670890296D00044EBA /* bandmat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFFCCB660890296D00044EBA /* bandmat.cpp */; };
162162
BFFCCBA0089029F400044EBA /* cholesky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFFCCB6A089029F400044EBA /* cholesky.cpp */; };
@@ -346,6 +346,7 @@
346346
BF3EB05408968F5500E02367 /* uctbx.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = uctbx.cpp; path = ../cctbx/cctbx/uctbx/uctbx.cpp; sourceTree = "<group>"; };
347347
BF3EB062089690D200E02367 /* spoil_optimization.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = spoil_optimization.cpp; path = ../cctbx/cctbx/uctbx/spoil_optimization.cpp; sourceTree = "<group>"; };
348348
BF49CDEF1B0BC56E0012BF3B /* covalent_radii.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = covalent_radii.cpp; path = ../cctbx/cctbx/eltbx/covalent_radii.cpp; sourceTree = "<group>"; };
349+
BF5EBF12283F8CB2000D09FE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
349350
BF69C4C8124F8C310035CF57 /* FoxClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FoxClient.cpp; path = src/FoxClient.cpp; sourceTree = "<group>"; };
350351
BF69C4C9124F8C310035CF57 /* FoxJob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FoxJob.cpp; path = src/FoxJob.cpp; sourceTree = "<group>"; };
351352
BF69C4CA124F8C310035CF57 /* FoxServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FoxServer.cpp; path = src/FoxServer.cpp; sourceTree = "<group>"; };
@@ -362,7 +363,6 @@
362363
BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwx_osx_cocoau-3.1.a"; path = "../static-libs/lib/libwx_osx_cocoau-3.1.a"; sourceTree = "<group>"; };
363364
BFF7D0C11478047800799F7A /* libwxjpeg-3.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxjpeg-3.1.a"; path = "../static-libs/lib/libwxjpeg-3.1.a"; sourceTree = "<group>"; };
364365
BFF7D0C21478047800799F7A /* libwxpng-3.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxpng-3.1.a"; path = "../static-libs/lib/libwxpng-3.1.a"; sourceTree = "<group>"; };
365-
BFF7D0C31478047800799F7A /* libwxregexu-3.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxregexu-3.1.a"; path = "../static-libs/lib/libwxregexu-3.1.a"; sourceTree = "<group>"; };
366366
BFFB474D0E5E0E620027591E /* wxLSQ.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = wxLSQ.cpp; path = ../ObjCryst/wxCryst/wxLSQ.cpp; sourceTree = SOURCE_ROOT; };
367367
BFFCCB5D089028E500044EBA /* libnewmat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnewmat.a; sourceTree = BUILT_PRODUCTS_DIR; };
368368
BFFCCB660890296D00044EBA /* bandmat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = bandmat.cpp; path = ../newmat/bandmat.cpp; sourceTree = "<group>"; };
@@ -1946,8 +1946,8 @@
19461946
buildActionMask = 2147483647;
19471947
files = (
19481948
BF1DE1130D228E6100A3939D /* AGL.framework in Frameworks */,
1949+
BF5EBF13283F8CB2000D09FE /* QuartzCore.framework in Frameworks */,
19491950
BF1DE1140D228E6100A3939D /* Carbon.framework in Frameworks */,
1950-
BFE729E8243A6A7900BABE40 /* libwxregexu-3.1.a in Frameworks */,
19511951
BFE729E6243A6A7300BABE40 /* libwxjpeg-3.1.a in Frameworks */,
19521952
BF1DE1150D228E6100A3939D /* System.framework in Frameworks */,
19531953
BF1DE1160D228E6100A3939D /* IOKit.framework in Frameworks */,
@@ -2265,6 +2265,7 @@
22652265
BF9466CB2205A0BB0086B9DC /* Frameworks */ = {
22662266
isa = PBXGroup;
22672267
children = (
2268+
BF5EBF12283F8CB2000D09FE /* QuartzCore.framework */,
22682269
);
22692270
name = Frameworks;
22702271
sourceTree = "<group>";
@@ -2276,7 +2277,6 @@
22762277
BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.1.a */,
22772278
BFF7D0C11478047800799F7A /* libwxjpeg-3.1.a */,
22782279
BFF7D0C21478047800799F7A /* libwxpng-3.1.a */,
2279-
BFF7D0C31478047800799F7A /* libwxregexu-3.1.a */,
22802280
BF1DE1230D228EA500A3939D /* libfftw3f.a */,
22812281
BF36112F0BD6E409000C0EE9 /* WebKit.framework */,
22822282
BF36112B0BD6E3F5000C0EE9 /* GLUT.framework */,

‎Fox/Fox_vc12.sln

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1818
Debug|Win32 = Debug|Win32
19-
Release_XP_NoCOD|Win32 = Release_XP_NoCOD|Win32
19+
Release (profile-guided optim generate)|Win32 = Release (profile-guided optim generate)|Win32
2020
Release|Win32 = Release|Win32
2121
EndGlobalSection
2222
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2323
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Debug|Win32.ActiveCfg = Debug|Win32
2424
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Debug|Win32.Build.0 = Debug|Win32
25-
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release_XP_NoCOD|Win32.ActiveCfg = Release_XP_NoCOD|Win32
26-
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release_XP_NoCOD|Win32.Build.0 = Release_XP_NoCOD|Win32
25+
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release (profile-guided optim generate)|Win32.ActiveCfg = Release (profile-guided optim generate)|Win32
26+
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release (profile-guided optim generate)|Win32.Build.0 = Release (profile-guided optim generate)|Win32
2727
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release|Win32.ActiveCfg = Release|Win32
2828
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release|Win32.Build.0 = Release|Win32
2929
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Debug|Win32.ActiveCfg = Debug|Win32
3030
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Debug|Win32.Build.0 = Debug|Win32
31-
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release_XP_NoCOD|Win32.ActiveCfg = Release_XP_NoCOD|Win32
32-
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release_XP_NoCOD|Win32.Build.0 = Release_XP_NoCOD|Win32
31+
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release (profile-guided optim generate)|Win32.ActiveCfg = Release (profile-guided optim generate)|Win32
32+
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release (profile-guided optim generate)|Win32.Build.0 = Release (profile-guided optim generate)|Win32
3333
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release|Win32.ActiveCfg = Release|Win32
3434
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release|Win32.Build.0 = Release|Win32
3535
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Debug|Win32.ActiveCfg = Debug|Win32
3636
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Debug|Win32.Build.0 = Debug|Win32
37-
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release_XP_NoCOD|Win32.ActiveCfg = Release_XP_NoCOD|Win32
38-
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release_XP_NoCOD|Win32.Build.0 = Release_XP_NoCOD|Win32
37+
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release (profile-guided optim generate)|Win32.ActiveCfg = Release (profile-guided optim generate)|Win32
38+
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release (profile-guided optim generate)|Win32.Build.0 = Release (profile-guided optim generate)|Win32
3939
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release|Win32.ActiveCfg = Release|Win32
4040
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release|Win32.Build.0 = Release|Win32
4141
EndGlobalSection

‎Fox/Fox_vc12.vcxproj

+58
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release (profile-guided optim generate)|Win32">
9+
<Configuration>Release (profile-guided optim generate)</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release_XP_NoCOD|Win32">
913
<Configuration>Release_XP_NoCOD</Configuration>
1014
<Platform>Win32</Platform>
@@ -35,6 +39,13 @@
3539
<WholeProgramOptimization>true</WholeProgramOptimization>
3640
<CharacterSet>Unicode</CharacterSet>
3741
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (profile-guided optim generate)|Win32'" Label="Configuration">
43+
<ConfigurationType>Application</ConfigurationType>
44+
<UseDebugLibraries>false</UseDebugLibraries>
45+
<PlatformToolset>v142</PlatformToolset>
46+
<WholeProgramOptimization>true</WholeProgramOptimization>
47+
<CharacterSet>Unicode</CharacterSet>
48+
</PropertyGroup>
3849
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_XP_NoCOD|Win32'" Label="Configuration">
3950
<ConfigurationType>Application</ConfigurationType>
4051
<UseDebugLibraries>false</UseDebugLibraries>
@@ -51,6 +62,9 @@
5162
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5263
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5364
</ImportGroup>
65+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release (profile-guided optim generate)|Win32'" Label="PropertySheets">
66+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67+
</ImportGroup>
5468
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_XP_NoCOD|Win32'" Label="PropertySheets">
5569
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5670
</ImportGroup>
@@ -65,6 +79,11 @@
6579
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
6680
<GenerateManifest>false</GenerateManifest>
6781
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (profile-guided optim generate)|Win32'">
83+
<LinkIncremental>false</LinkIncremental>
84+
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
85+
<GenerateManifest>false</GenerateManifest>
86+
</PropertyGroup>
6887
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_XP_NoCOD|Win32'">
6988
<LinkIncremental>false</LinkIncremental>
7089
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
@@ -136,6 +155,45 @@
136155
<AdditionalIncludeDirectories>$(SolutionDir)..\wxWidgets\include\msvc;$(SolutionDir)..\wxWidgets\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
137156
</ResourceCompile>
138157
</ItemDefinitionGroup>
158+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release (profile-guided optim generate)|Win32'">
159+
<ClCompile>
160+
<WarningLevel>Level3</WarningLevel>
161+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
162+
<Optimization>MaxSpeed</Optimization>
163+
<FunctionLevelLinking>true</FunctionLevelLinking>
164+
<IntrinsicFunctions>true</IntrinsicFunctions>
165+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);__WX__CRYST__;HAVE_SSE_MATHFUN;USE_SSE2;OBJCRYST_GL;HAVE_FFTW;__FOX_COD__</PreprocessorDefinitions>
166+
<SDLCheck>false</SDLCheck>
167+
<AdditionalIncludeDirectories>$(SolutionDir)..\;$(SolutionDir)..\cctbx\include;$(SolutionDir)..\ObjCryst;$(SolutionDir)..\wxWidgets\include\msvc;$(SolutionDir)..\wxWidgets\include;$(SolutionDir)..\fftw\api;$(ProjectDir)\..\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
168+
<ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
169+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
170+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
171+
<FloatingPointModel>Fast</FloatingPointModel>
172+
<FloatingPointExceptions>
173+
</FloatingPointExceptions>
174+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
175+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
176+
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
177+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
178+
<BufferSecurityCheck>false</BufferSecurityCheck>
179+
</ClCompile>
180+
<Link>
181+
<SubSystem>Windows</SubSystem>
182+
<GenerateDebugInformation>false</GenerateDebugInformation>
183+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
184+
<OptimizeReferences>true</OptimizeReferences>
185+
<AdditionalLibraryDirectories>$(SolutionDir)..\wxWidgets\lib\vc_lib;$(SolutionDir)$(Configuration);$(SolutionDir)..\fftw\fftw-3.3-libs\Static-Release;$(ProjectDir)\..\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
186+
<IgnoreSpecificDefaultLibraries>
187+
</IgnoreSpecificDefaultLibraries>
188+
<AdditionalDependencies>newmat.lib;cctbx.lib;libfftwf-3.3.lib;%(AdditionalDependencies)</AdditionalDependencies>
189+
<ShowProgress>LinkVerbose</ShowProgress>
190+
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
191+
<AdditionalOptions>/GENPROFILE %(AdditionalOptions)</AdditionalOptions>
192+
</Link>
193+
<ResourceCompile>
194+
<AdditionalIncludeDirectories>$(SolutionDir)..\wxWidgets\include\msvc;$(SolutionDir)..\wxWidgets\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
195+
</ResourceCompile>
196+
</ItemDefinitionGroup>
139197
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_XP_NoCOD|Win32'">
140198
<ClCompile>
141199
<WarningLevel>Level3</WarningLevel>

‎Fox/bc32.mak

-20
This file was deleted.

0 commit comments

Comments
 (0)