From 422b1650d326aa63eed790d9b7360e821a2e358d Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Thu, 20 Oct 2005 19:00:00 +0000 Subject: [PATCH] Changed lf yo f formats --- motorApp/NewportSrc/XPSGathering.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/motorApp/NewportSrc/XPSGathering.cc b/motorApp/NewportSrc/XPSGathering.cc index 0a62b52c..b40350c5 100644 --- a/motorApp/NewportSrc/XPSGathering.cc +++ b/motorApp/NewportSrc/XPSGathering.cc @@ -175,17 +175,17 @@ printf(" socket=%i, gathering=%s\n",socket,gatheringdata); if(j == (numAxes-1)) { - if(fscanf(trajFile," %lf,%*lf",&trajStep) != 1) printf("trajerror\n");} + if(fscanf(trajFile," %lf,%*f",&trajStep) != 1) printf("trajerror\n");} if (j == 0){ - if(fscanf(trajFile,"%lf, %lf,%*lf,",&trajTime,&trajStep) != 2) printf("trajerror\n");} + if(fscanf(trajFile,"%lf, %lf,%*f,",&trajTime,&trajStep) != 2) printf("trajerror\n");} if (j > 0 && j < (numAxes-1)){ - if(fscanf(trajFile," %lf,%*lf,",&trajStep) != 1) printf("trajerror\n");} + if(fscanf(trajFile," %lf,%*f,",&trajStep) != 1) printf("trajerror\n");} if(i == 0) { posTheory[j] = motorReadbacks[j][i]; - printf("posTheory = %lf ",posTheory[j]);} + printf("posTheory = %f ",posTheory[j]);} else{ posTheory[j]+= trajStep;}