with '#' will be ignored, and an empty message aborts the commit.
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
modified: hostdepend/ARM64MAC64
modified: include/eosStarFile.h
deleted: src/Objects/.DS_Store
deleted: src/Objects/.Source.org
deleted: src/Objects/DataExpress/.Source.org
deleted: src/Objects/DataExpress/Makefile.org
deleted: src/Objects/DataManip/.Source.org
deleted: src/Objects/DataManip/Makefile.org
modified: src/Objects/DataManip/eosStarFile/doc/eosStarFile.html
modified: src/Objects/DataManip/eosStarFile/inc/eosStarFile.h
deleted: src/Objects/General/Makefile.org
modified: src/Tools/mrcImage/mrcImageAbnormalValueRemove/src/mrcImageAbnormalValueRemove.c
modified: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/mrcImageBlurByTemperatureFactor.c
modified: util/src/DataFormat/Makefile
Changes not staged for commit:
modified: hostdepend/ARM64MAC64 (new commits)
modified: include/eosMATH.h
-Subproject commit b8745dfd26b78656350495ca523e2608ddcb3bfb
+Subproject commit 3f7dd8c2ccc4056ad9956e03de20fa4605de3ad4
extern int eosStarFilDataGetInterger (eosStarFile* star, char* block, char* key, int* value, int mode);
// Loop
-char** eosStarFileLoopDataGetStringP(eosStarFile* star, char* key, int mode);
-void eosStarFileLoopDataGetString(eosStarFile* star, char* key, char*** value, int mode);
+extern char** eosStarFileLoopDataGetStringP(eosStarFile* star, char* key, int mode);
+extern void eosStarFileLoopDataGetString(eosStarFile* star, char* key, char*** value, int mode);
-double* eosStarFileLoopDataGetRealP(eosStarFile* star, char* key, int mode);
-void eosStarFileLoopDataGetReal(eosStarFile* star, char* key, double** value, int mode);
+extern double* eosStarFileLoopDataGetRealP(eosStarFile* star, char* key, int mode);
+extern void eosStarFileLoopDataGetReal(eosStarFile* star, char* key, double** value, int mode);
-int* eosStarFileLoopDataGetIntergerP(eosStarFile* star, char* key, int mode);
-void eosStarFileLoopDataGetInterger(eosStarFile* star, char* key, int** value, int mode);
+extern int* eosStarFileLoopDataGetIntergerP(eosStarFile* star, char* key, int mode);
+extern void eosStarFileLoopDataGetInterger(eosStarFile* star, char* key, int** value, int mode);
+// Write
+extern void eosStarFileWrite(FILE* fpt, eosStarFile* star, int mode);
/* prototype end */
#ifdef __cplusplus
+++ /dev/null
-SOURCE=\
-DataExpress \
-DataManip \
-General \
-MachineManip \
-#LastSource
+++ /dev/null
-SOURCE=\
-Contour \
-TclTk \
-avsFile \
-eosAlsa \
-eosOpenGL \
-eosRuby \
-gifFile \
-pngFile \
-psFile \
-#LastSource
+++ /dev/null
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-include Config/Target.inc
+++ /dev/null
-SOURCE=\
-DCDFile \
-IMAGIC \
-bildFile \
-bmpFile \
-ctfInfo \
-ctfforBayes \
-dmFile \
-dsn6File \
-emData \
-eosMATH \
-eosStarFile \
-khorosData \
-largeIP \
-llData \
-ltlgData \
-mapFile \
-mrcImage \
-mrcImageShape \
-pdbFile \
-rigakuImage \
-simulation \
-tgaFile \
-transform \
-#LastSource
+++ /dev/null
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-include Config/Target.inc
<H2>Information from source codes</H2>
</A>
<PRE>
-../src/eosStarFileDataGet.c:
-
-../src/eosStarFileLoopDataGet.c:
-
-../src/eosStarFileRead.c:
-
-../src/eosStarFileWrite.c:
</PRE>
<HR>
<A NAME="include">
extern int eosStarFilDataGetInterger (eosStarFile* star, char* block, char* key, int* value, int mode);
// Loop
-char** eosStarFileLoopDataGetStringP(eosStarFile* star, char* key, int mode);
-void eosStarFileLoopDataGetString(eosStarFile* star, char* key, char*** value, int mode);
+extern char** eosStarFileLoopDataGetStringP(eosStarFile* star, char* key, int mode);
+extern void eosStarFileLoopDataGetString(eosStarFile* star, char* key, char*** value, int mode);
-double* eosStarFileLoopDataGetRealP(eosStarFile* star, char* key, int mode);
-void eosStarFileLoopDataGetReal(eosStarFile* star, char* key, double** value, int mode);
+extern double* eosStarFileLoopDataGetRealP(eosStarFile* star, char* key, int mode);
+extern void eosStarFileLoopDataGetReal(eosStarFile* star, char* key, double** value, int mode);
-int* eosStarFileLoopDataGetIntergerP(eosStarFile* star, char* key, int mode);
-void eosStarFileLoopDataGetInterger(eosStarFile* star, char* key, int** value, int mode);
+extern int* eosStarFileLoopDataGetIntergerP(eosStarFile* star, char* key, int mode);
+extern void eosStarFileLoopDataGetInterger(eosStarFile* star, char* key, int** value, int mode);
+// Write
+extern void eosStarFileWrite(FILE* fpt, eosStarFile* star, int mode);
/* prototype end */
#ifdef __cplusplus
extern int eosStarFilDataGetInterger (eosStarFile* star, char* block, char* key, int* value, int mode);
// Loop
-char** eosStarFileLoopDataGetStringP(eosStarFile* star, char* key, int mode);
-void eosStarFileLoopDataGetString(eosStarFile* star, char* key, char*** value, int mode);
+extern char** eosStarFileLoopDataGetStringP(eosStarFile* star, char* key, int mode);
+extern void eosStarFileLoopDataGetString(eosStarFile* star, char* key, char*** value, int mode);
-double* eosStarFileLoopDataGetRealP(eosStarFile* star, char* key, int mode);
-void eosStarFileLoopDataGetReal(eosStarFile* star, char* key, double** value, int mode);
+extern double* eosStarFileLoopDataGetRealP(eosStarFile* star, char* key, int mode);
+extern void eosStarFileLoopDataGetReal(eosStarFile* star, char* key, double** value, int mode);
-int* eosStarFileLoopDataGetIntergerP(eosStarFile* star, char* key, int mode);
-void eosStarFileLoopDataGetInterger(eosStarFile* star, char* key, int** value, int mode);
+extern int* eosStarFileLoopDataGetIntergerP(eosStarFile* star, char* key, int mode);
+extern void eosStarFileLoopDataGetInterger(eosStarFile* star, char* key, int** value, int mode);
+// Write
+extern void eosStarFileWrite(FILE* fpt, eosStarFile* star, int mode);
/* prototype end */
#ifdef __cplusplus
+++ /dev/null
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-include Config/Target.inc
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
}
}
fprintf(linfo->paramOut,"AbnormalValue: %f -> %f at %f %f %f\n", data, dst, x, y, z);
- }
+ } else {
+ dst = data;
+ }
+ mrcPixelDataSet(out, x, y, z, dst, mrcPixelRePart);
}
}
}
break;
}
}
- mrcPixelDataSet(out, x, y, z, data, mrcPixelRePart);
return;
}
#include "genUtil.h"
#include "mrcImage.h"
+typedef struct atomInfo {
+ int nAtom;
+ mrcImageParaTypeRealCoord* coord;
+ mrcImageParaTypeReal* Temparature;
+} atomInfo;
+
typedef struct lmrcImageBlurByTemperatureFactorInfo {
- float a;
- int b;
+ atomInfo
} lmrcImageBlurByTemperatureFactorInfo;
typedef enum lmrcImageBlurByTemperatureFactorMode {
@echo "make pkg-config"
@echo "make icu"
@echo "make cif_api"
+ @echo "make libcif"
HDF5-VERSION=1.13.0
HDF5-VERSION2=1-13-0
PKG-CONFIG-VERSION=0.29.2
-
target::
make pkg-config
make icu
make hdf5
make cif_api
+ make libcif
init:: init-hdf5 init-cif_api init-icu
cleanAll-hdf5::
rm -f hdf5-$(HDF5-VERSION3).tar.gz; rm -rf hdf5-$(HDF5-VERSION3)
+libcif:
+ make init-libcif
+ make config-libcif
+ make all-libcif
+ make clean-libcif
+ make cleanAll-libcif
+
+init-libcif:
+ git clone https://github.com/ElectronicStructureLibrary/libcif.git