Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base

diff --cc include/ctffuncforbayes.h
index e792a48,42a4b07..0cb2903
--- 1/include/ctffuncforbayes.h
--- 2/include/ctffuncforbayes.h
+++ b/include/ctffuncforbayes.h
@@@ -22,24 -22,18 +22,23 @@@
  /* struct begin */
  
  typedef struct ctfforbayes{
 -      int n;
 -      float* R;
 -      float* I;
 -      float** Ii;
 +  int n;
 +  float* R;
 +  float rmax;
 +  float rmin;
 +  float* I;
 +  float** Ii;
  } ctfforbayes;
  
 -typedef struct intencityforbayes{
  
 +typedef struct intensityforbayes{
 +  float** normI;
 +  float** logI;
 +  float** normII;
 +  float** logII;
    
 -
 -}intencityforbayes;
 +} intensityforbayes;
  
- 
  /* struct end */
  
  #ifdef __cplusplus

diff --cc src/Tools/Config/Define.inc
index 9367728,9ee2d89..a26fb19
--- 1/src/Tools/Config/Define.inc
--- 2/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@@ -1,12 -1,1 +1,15 @@@
  WORLDNAME=Tools
++<<<<<<< HEAD
 +WORLDNAME=Tools
 +WORLDNAME=Tools
 +WORLDNAME=Tools
 +WORLDNAME=Tools
 +WORLDNAME=Tools
 +WORLDNAME=Tools
 +WORLDNAME=Tools
 +WORLDNAME=Tools
 +WORLDNAME=Tools
 +WORLDNAME=Tools
 +WORLDNAME=Tools
++=======
++>>>>>>> 66d06891951fa5620cca3fb5b8744fb305b4e78a