modified: mrcImageFractalFourierShellCorrelation.c

	modified:   pdbListRMSDCalc.c

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFractalFourierShellCorrelation b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFractalFourierShellCorrelation
index e0e7a30..cb12308 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFractalFourierShellCorrelation and b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFractalFourierShellCorrelation differ

diff --git a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/X86LINUX64/mrcImageFractalFourierShellCorrelation b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/X86LINUX64/mrcImageFractalFourierShellCorrelation
index e0e7a30..cb12308 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/X86LINUX64/mrcImageFractalFourierShellCorrelation and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/X86LINUX64/mrcImageFractalFourierShellCorrelation differ

diff --git a/src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/mrcImageFractalFourierShellCorrelation.c b/src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/mrcImageFractalFourierShellCorrelation.c
index 71bbbd4..88968ca 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/mrcImageFractalFourierShellCorrelation.c
+++ b/src/Tools/mrcImage/mrcImageFractalFourierShellCorrelation/src/mrcImageFractalFourierShellCorrelation.c
@@ -152,7 +152,9 @@ lmrcImageFractalFourierShellCorrelation(mrcImage* out, mrcImage* in, mrcImage* r
     if(NULL == (fp=fopen(linfo.Log,"w"))){
       fprintf(stderr,"Can't open the file.\n");
     }
-  }
+  } else {
+    fp = NULL; 
+  } 
   
   if(0==linfo.xmax)linfo.xmax=in->HeaderN.x;
   if(0==linfo.ymax)linfo.ymax=in->HeaderN.y;

diff --git a/src/Tools/pdbUtil/pdbListRMSDCalc/src/pdbListRMSDCalc.c b/src/Tools/pdbUtil/pdbListRMSDCalc/src/pdbListRMSDCalc.c
index c3219a3..76d336b 100755 (executable)
--- a/src/Tools/pdbUtil/pdbListRMSDCalc/src/pdbListRMSDCalc.c
+++ b/src/Tools/pdbUtil/pdbListRMSDCalc/src/pdbListRMSDCalc.c
@@ -34,6 +34,7 @@ FILE** lFileListRead(char * InList,int n);
 void lpdbFileListRead(FILE** fpt, pdbFile** pdbArray, int n, int mode);
 void lpdbRMSDCalc(pdbFile* pdbRMSD, pdbFile* pdbArray, int n,lpdbRMSDCalcInfo* linfo, FILE* fptRef, int mode);
 void additionalUsage();
+
 int
 main(int argc, char* argv[]) 
 {
@@ -42,9 +43,11 @@ main(int argc, char* argv[])
   pdbFile* pdbArray;
   pdbFile  pdbRMSD;
   int n=0;
+
   init0(&info);
   argCheck(&info, argc, argv);
   init1(&info);
+
   fprintf(stdout,"test1:%s\n",info.Ref);
   info.fptIn=lFileListRead(info.InList,info.flagIn);
   lpdbFileListRead(info.fptIn, &pdbArray, info.flagIn, 0); 
@@ -52,8 +55,9 @@ main(int argc, char* argv[])
   lpdbRMSDCalc(&pdbRMSD, pdbArray, info.flagIn , &linfo, info.fptRef,info.mode);
   pdbFileWrite(info.fptOut, &pdbRMSD);
   fclose(info.fptOut);
+
   DEBUGPRINT("Program Start\n");
-  exit(EXIT_SUCCESS);
+  return 0; 
 }
 
 void
@@ -110,6 +114,7 @@ void lpdbRMSDCalc(pdbFile* pdbRMSD, pdbFile* pdbArray, int n, lpdbRMSDCalcInfo*
   int nline;
   pdbFile ref;
   int old=0,now=0;
+
   if(mode==1) {
     pdbFileRead(fptRef, &ref);
     pdbFileTop(&ref);