modified

diff --git a/src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.c b/src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.c
index 031cadf..029b99e 100755 (executable)
--- a/src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.c
+++ b/src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.c
@@ -90,7 +90,7 @@ main(int argc, char* argv[])
   /*global carse search*/
   DEBUGPRINT("carse search start\n");
   ctf.rmax = Rmax;
-  ctf.rmin = Rmin;
+  ctf.rmin = Rintermediate;
   DEBUGPRINT2("set R range:%f~%f\n",ctf.rmin,ctf.rmax);
   DefocusEstimationLoop(info,&out,&ctfinfo,&ctf,&intensity,&likelihood,0,0);
   DEBUGPRINT("carse search finish\n");
@@ -103,9 +103,9 @@ main(int argc, char* argv[])
   DEBUGPRINT2("set R range:%f~%f\n",ctf.rmin,ctf.rmax);
 
   DEBUGPRINT("set maxposteriorflag of df, A, k\n");
-  eosBayesMaxposteriorflagSet(&out,0);
-  eosBayesMaxposteriorflagSet(&out,1);
-  eosBayesMaxposteriorflagSet(&out,3);
+  //  eosBayesMaxposteriorflagSet(&out,0);
+  //  eosBayesMaxposteriorflagSet(&out,1);
+  // eosBayesMaxposteriorflagSet(&out,3);
 
   DEBUGPRINT("----maxflagcheck----\n");
   #ifdef DEBUG
@@ -115,6 +115,9 @@ main(int argc, char* argv[])
   #endif
 
   DEBUGPRINT("set canstantflag of Ain");
+  out.posterior[0].constantflag = 1;
+  out.posterior[1].constantflag = 1;
+  out.posterior[3].constantflag = 1;
   out.posterior[5].constantflag = 1;
 
   DEBUGPRINT("set resetflag of \n");
@@ -151,12 +154,13 @@ main(int argc, char* argv[])
 
   DEBUGPRINT("set canstantflag of Ain");
   out.posterior[3].constantflag = 1;
-  out.posterior[5].constantflag = 1;
+  out.posterior[5].constantflag = 0;
 
   DEBUGPRINT("set resetflag of df,k\n");
   out.prior[0].resetflag = 1;
   out.prior[1].resetflag = 1;
   out.prior[2].resetflag = 1;
+  out.prior[5].resetflag = 1;
   eosBayesProbabilityReset(info.fptIn,&out,1,0);
 
   DistributionChangeCheck(&out, 4, 0);
@@ -173,7 +177,7 @@ main(int argc, char* argv[])
 
 
   /*df,A serch*/
-
+  /*
   DEBUGPRINT("df, A, k search start\n");
   ctf.rmax = Rintermediate;
   ctf.rmin = Rmin;
@@ -242,7 +246,7 @@ main(int argc, char* argv[])
   DefocusEstimationLoop(info,&out,&ctfinfo,&ctf,&intensity,&likelihood,6,1);
   DEBUGPRINT("defocus refinement finish\n");
   ctfforbayescheckIntensityOfMaxPosterior(ctf,out.posterior,out.numDistribution,&ctfinfo,intensity.MTFmode,intensity.Ainmode,1,1);
-
+  */
   /*defocus refinement*/
 /*
   DEBUGPRINT("defocus refinement start\n");