Commit 5f2c2856 authored by Pilar Cossio's avatar Pilar Cossio

New Print Map Possibility, Separate BioEM terms, and tidying up

parent 7f1dacfb
This diff is collapsed.
......@@ -74,6 +74,11 @@ __device__ static inline myfloat_t calc_logpro(const bioem_param_device& param,
/// ******* Calculating log of Prob*********
// As in fortran code: logpro=(3-Ntotpi)*0.5*log(firstele/pConvMap[iOrient].ForLogProbfromConv[iConv])+(Ntotpi*0.5-2)*log(Ntotpi-2)-0.5*log(pConvMap[iOrient].ForLogProbfromConv[iConv])+0.5*log(PI)+(1-Ntotpi*0.5)*(log(2*PI)+1);
const myfloat_t logpro = (3 - param.Ntotpi) * 0.5 * log(firstele) + (param.Ntotpi * 0.5 - 2) * log((param.Ntotpi - 2) * ForLogProb);
if(param.debugterm){
printf("Separate cc: %f c: %f oo: %f o: %f co: %f logP: %f\n",sumsquare,sum,sumsquareref,sumref,crossproMapConv, logpro );
}
return(logpro);
}
......
......@@ -7,6 +7,8 @@
#include <math.h>
#include <fftw3.h>
using namespace std;
class bioem_param_device
{
public:
......@@ -23,6 +25,7 @@ public:
bool writeAngles;
bool writeCC;
bool flipped;
bool debugterm;
int CCdisplace;
};
......@@ -33,9 +36,10 @@ public:
bioem_param();
~bioem_param();
int readParameters(const char* fileinput);
int readParameters(const char* fileinput,const char* fileangles);
int CalculateGridsParam();
int CalculateRefCTF();
int forprintBest(const char* fileinput);
void PrepareFFTs();
bool doaaradius;
......@@ -53,6 +57,13 @@ public:
int angleGridPointsAlpha;
int angleGridPointsBeta;
bool notuniformangles;
int NotUn_angles;
bool withnoise;
myfloat_t stnoise;
std::string inanglef;
int numberGridPointsDisplaceCenter;
// Grid sampling for the convolution kernel
//ENVELOPE
......@@ -84,6 +95,9 @@ public:
bool dumpMap, loadMap;
int ddx,ddy;
myfloat_t bestnorm,bestoff;
private:
void releaseFFTPlans();
};
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment