• R/O
  • HTTP
  • SSH
  • HTTPS

base: コミット

This repository is a base of Eos.


コミットメタ情報

リビジョン80bdf2da5ca1374a6c9454226bc6918d6bc541bf (tree)
日時2018-01-26 17:42:19
作者安永卓生 <tacyas@yasu...>
コミッター安永卓生

ログメッセージ

modified: include/Matrix3D.h

_cplusplus -> cplusplus

modified: include/lmrcFFTCentralSection.h

template -> template3D

modified: src/Objects/DataExpress/TclTk/src/ctfInfo.wish
modified: src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h
modified: src/Objects/General/Matrix3D/inc/Matrix3D.h
modified: src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.c

変更サマリ

差分

--- a/include/Matrix3D.h
+++ b/include/Matrix3D.h
@@ -49,7 +49,7 @@ typedef struct EulerAngleInfo {
4949 #include "Vector.h"
5050 #include <stdio.h>
5151
52-#ifdef _cplusplus
52+#ifdef __cplusplus
5353 extern "C" {
5454 #endif
5555
@@ -90,7 +90,7 @@ extern void matrix3DEulerAngleGetFromMatrix3D(Matrix3D Matrix, const char Mode[4
9090
9191 /* prototype end */
9292
93-#ifdef _cplusplus
93+#ifdef __cplusplus
9494 };
9595 #endif
9696
--- a/include/lmrcFFTCentralSection.h
+++ b/include/lmrcFFTCentralSection.h
@@ -101,7 +101,7 @@ extern "C" {
101101
102102 /* prototype begin */
103103
104-extern void lmrcFFTCentralSectionGet(mrcImage* out, mrcImage* template, mrcImage* volume, lmrcFFTCentralSectionInfo* linfo, int mode);
104+extern void lmrcFFTCentralSectionGet(mrcImage* out, mrcImage* template3D, mrcImage* volume, lmrcFFTCentralSectionInfo* linfo, int mode);
105105
106106 extern void lmrcImageFFTRhoFilter(mrcImage* volFT, mrcImage* count, lmrcFFTCentralSectionInfo* linfo, int mode);
107107 //extern void lmrcImageFFTCentralSectionPut(mrcImage* volFT, mrcImage* count, mrcImage* template3D, mrcImage* in, lmrcFFTCentralSectionInfo* linfo, int* c, int mode);
@@ -113,7 +113,7 @@ extern void lmrcFFTCentralSectionCompareInfoWrite(FILE* fpt, float Likelihood, i
113113 extern void lmrcFFTCentralSectionCompareInfoWriteLikelihood(FILE* fpt, float Likelihood, int mode);
114114
115115 //lmrcMultiFFTCentralSectionsComapre
116-extern void lmrcFFTCentralSectionsGet(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, mrcImage* template, mrcImage* volume, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode, int nummode);
116+extern void lmrcFFTCentralSectionsGet(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, mrcImage* template3D, mrcImage* volume, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode, int nummode);
117117 extern void lmrcMultiFFTCentralSectionsCompare(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, mrcImage* in, mrcImage* volume, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode, int nummode);
118118 extern void lmrcMultiFFTCentralSectionsCompareNormalization(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode);
119119 extern void lmrcMultiFFTCentralSectionsCompareInfoWrite(FILE* fpt, char* filename, lmrcMultiFFTCentralSectionsCompareInfoOut* Out, lmrcMultiFFTCentralSectionsCompareInfo* linfo, float mode1, float mode2);
--- a/src/Objects/DataExpress/TclTk/src/ctfInfo.wish
+++ b/src/Objects/DataExpress/TclTk/src/ctfInfo.wish
@@ -65,7 +65,7 @@ proc Init { { mrc __null__ } } {
6565 set ctfInfo(.defdirctfinfo) "~/.Eos/DefCTFInfo"
6666 set ctfInfo(whichMolec) Gauss
6767 set ctfInfo(.molcEnvTable) "./carbon.table"
68- set ctfInfo(MolcEnv) 8.0
68+ set ctfInfo(MolcEnv) 1.0
6969 set ctfInfo(dMolcEnv) 1.0
7070 set ctfInfo(Elastic) 2.4912
7171 set ctfInfo(dElastic) 0.0000
@@ -189,7 +189,7 @@ proc Init { { mrc __null__ } } {
189189 set ctfInfo(Magnification) 1.0
190190 set ctfInfo(dMagnification) -0.005
191191 # Vibration
192- set ctfInfo(flagVibration) 1
192+ set ctfInfo(flagVibration) 0
193193 set ctfInfo(BofVibration) 4.0
194194 set ctfInfo(VibrationMode) 0
195195 # Aliasing
--- a/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h
+++ b/src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h
@@ -101,7 +101,7 @@ extern "C" {
101101
102102 /* prototype begin */
103103
104-extern void lmrcFFTCentralSectionGet(mrcImage* out, mrcImage* template, mrcImage* volume, lmrcFFTCentralSectionInfo* linfo, int mode);
104+extern void lmrcFFTCentralSectionGet(mrcImage* out, mrcImage* template3D, mrcImage* volume, lmrcFFTCentralSectionInfo* linfo, int mode);
105105
106106 extern void lmrcImageFFTRhoFilter(mrcImage* volFT, mrcImage* count, lmrcFFTCentralSectionInfo* linfo, int mode);
107107 //extern void lmrcImageFFTCentralSectionPut(mrcImage* volFT, mrcImage* count, mrcImage* template3D, mrcImage* in, lmrcFFTCentralSectionInfo* linfo, int* c, int mode);
@@ -113,7 +113,7 @@ extern void lmrcFFTCentralSectionCompareInfoWrite(FILE* fpt, float Likelihood, i
113113 extern void lmrcFFTCentralSectionCompareInfoWriteLikelihood(FILE* fpt, float Likelihood, int mode);
114114
115115 //lmrcMultiFFTCentralSectionsComapre
116-extern void lmrcFFTCentralSectionsGet(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, mrcImage* template, mrcImage* volume, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode, int nummode);
116+extern void lmrcFFTCentralSectionsGet(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, mrcImage* template3D, mrcImage* volume, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode, int nummode);
117117 extern void lmrcMultiFFTCentralSectionsCompare(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, mrcImage* in, mrcImage* volume, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode, int nummode);
118118 extern void lmrcMultiFFTCentralSectionsCompareNormalization(lmrcMultiFFTCentralSectionsCompareInfoOut* Out, lmrcMultiFFTCentralSectionsCompareInfo* linfo, int mode);
119119 extern void lmrcMultiFFTCentralSectionsCompareInfoWrite(FILE* fpt, char* filename, lmrcMultiFFTCentralSectionsCompareInfoOut* Out, lmrcMultiFFTCentralSectionsCompareInfo* linfo, float mode1, float mode2);
--- a/src/Objects/General/Matrix3D/inc/Matrix3D.h
+++ b/src/Objects/General/Matrix3D/inc/Matrix3D.h
@@ -49,7 +49,7 @@ typedef struct EulerAngleInfo {
4949 #include "Vector.h"
5050 #include <stdio.h>
5151
52-#ifdef _cplusplus
52+#ifdef __cplusplus
5353 extern "C" {
5454 #endif
5555
@@ -90,7 +90,7 @@ extern void matrix3DEulerAngleGetFromMatrix3D(Matrix3D Matrix, const char Mode[4
9090
9191 /* prototype end */
9292
93-#ifdef _cplusplus
93+#ifdef __cplusplus
9494 };
9595 #endif
9696
--- a/src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.c
+++ b/src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.c
@@ -17,7 +17,7 @@
1717
1818 #define DEBUG
1919 #include "genUtil.h"
20-#include "Class.h"
20+#include "eosPoint.h"
2121
2222 /*
2323 Example:
@@ -42,6 +42,13 @@ main(int argc, char* argv[])
4242 init1(&info);
4343
4444 DEBUGPRINT("Program Start\n");
45+ /*
46+extern void eosPointFileFormatUsage(FILE* fpt);
47+ 43 extern void eosPointRead(FILE* fpt, eosPoint* p, int mode);
48+ 44
49+ 45 extern void eosPointWrite(FILE* fpt, eosPoint* p, int mode);
50+ */
51+ DEBUGPRINT("Not Completed\n");
4552
4653 exit(EXIT_SUCCESS);
4754 }
@@ -50,4 +57,7 @@ void
5057 additionalUsage()
5158 {
5259 fprintf(stderr, "----- Additional Usage -----\n");
60+ fprintf(Stderr, "eosPointFormat\n");
61+ eosPointFileFormatUsage(stderr);
62+ 46
5363 }
旧リポジトリブラウザで表示