diff --git a/inputfiles/calibration b/inputfiles/calibration index c5b4bc5..70ca344 100644 --- a/inputfiles/calibration +++ b/inputfiles/calibration @@ -7,4 +7,4 @@ 0:1 1 0 0 -100 50 50 mcmc.dat \ No newline at end of file +100 50 50 mcmc.dat diff --git a/src/main.cpp b/src/main.cpp index c3732e7..59b7f61 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,6 +35,7 @@ int main( int argc , char* argv[] ){ void do_work( char* fname ){ /************ Reading the input file ***********/ + ifstream fp(fname); string line,mcmcfile; stringstream ss; int i,nfiles,nfq,mode,npar,bin1,bin2,fit_type,nrun,nburn,nwk; bool strict; @@ -59,6 +60,7 @@ void do_work( char* fname ){ for(i=0;i 0 or mode==-1 ){ vec errs; errs.setlength(nfq); vector lc1; for( i=0 ; i >&LC , string fname , int secL , int b1 , int /* Initialize file stream, define some variables */ ifstream fp(fname.c_str()); string line,sdum; stringstream ss; int i,j,nlc,n,nsec,ns,sl; double dt; - /* read dt from the description line */ getline(fp,line); ss.str(line); ss >> sdum >> dt >> nlc; ss.clear(); @@ -193,6 +194,7 @@ void readLC( vector >&LC , string fname , int secL , int b1 , int }else { Lc.push_back(lcurve(t,lc[b1],lce[b1],dt)); } + cerr << "Yo6!"; // Do we need a second light curve? if(b2!=-1){Lc.push_back(lcurve(t,lc[b2],lce[b2],dt));} diff --git a/src/makefile b/src/makefile index e3b613b..3683626 100644 --- a/src/makefile +++ b/src/makefile @@ -1,6 +1,7 @@ -incdir='/home/caes/science/psdlag-agn/src/' +#incdir='/home/caes/science/psdlag-agn/src/' +incdir='/Users/othoulrich/science/psdlag-agn/src' psdlag: