CDPP / AMDA_IHM

Commit 0e402a32b80ff329f400beb5e347b53c42b5f048

Authored by Elena.Budnik
1 parent bab40211
Exists in master and in 94 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

rm 7466

Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
Inline Side-by-side
php/src/cdfsamplingfromdata.c
  Diff comments   View file @0e402a3
... ... @@ -126,7 +126,7 @@ int main(int argc, char *argv[])
126 126 if (datatype == CDF_TIME_TT2000) {
127 127 dbl_value_ = CDF_TT2000_to_UTC_EPOCH(int_value[0]);
128 128 dbl_value = CDF_TT2000_to_UTC_EPOCH(int_value[1]);
129   - sampling = (int)(dbl_value - dbl_value_ + 50)/100;
  129 + sampling = (int)(dbl_value - dbl_value_);
130 130 }
131 131 else {
132 132 if (datatype == CDF_EPOCH16) {
... ... @@ -139,7 +139,7 @@ int main(int argc, char *argv[])
139 139 EPOCH16breakdown(epoch16, &year, &month, &day, &hour, &minute, &sec, &msec, &mksec, &nsec, &psec);
140 140 value[1] = computeEPOCH(year, month, day, hour, minute, sec, msec);
141 141 }
142   - sampling = (int)(value[1] - value[0] + 50)/100;
  142 + sampling = (int)(value[1] - value[0]);
143 143 }
144 144  
145 145 // fprintf(stdout,"value %f\n", value[11]-value[10]);
... ... @@ -150,5 +150,5 @@ int main(int argc, char *argv[])
150 150 if ((cstatus = CDFlib(CLOSE_, CDF_, NULL_)) != CDF_OK)
151 151 cdf_handle_error (cstatus);
152 152  
153   - fprintf(stdout,"%f\n",(float)sampling/10.0);
  153 + fprintf(stdout,"%f\n",(float)sampling/1000.0); // in sec.msec
154 154 }
... ...
php/src/cdfsamplingsfromdata.c
  Diff comments   View file @0e402a3
... ... @@ -162,7 +162,7 @@ int main(int argc, char *argv[])
162 162 if (datatype == CDF_TIME_TT2000) {
163 163 dbl_value_ = CDF_TT2000_to_UTC_EPOCH(int_value[i-1]);
164 164 dbl_value = CDF_TT2000_to_UTC_EPOCH(int_value[i]);
165   - delta[i-1] = (int)(dbl_value - dbl_value_ + 50)/100;
  165 + delta[i-1] = (int)(dbl_value - dbl_value_);
166 166 }
167 167 else {
168 168 if (datatype == CDF_EPOCH16) {
... ... @@ -175,7 +175,7 @@ int main(int argc, char *argv[])
175 175 EPOCH16breakdown(epoch16, &year, &month, &day, &hour, &minute, &sec, &msec, &mksec, &nsec, &psec);
176 176 value[i] = computeEPOCH(year, month, day, hour, minute, sec, msec);
177 177 }
178   - delta[i-1] = (int)(value[i] - value[i-1] + 50)/100;
  178 + delta[i-1] = (int)(value[i] - value[i-1]);
179 179 }
180 180 }
181 181 // fprintf(stdout,"value %f\n", value[11]-value[10]);
... ... @@ -194,5 +194,5 @@ int main(int argc, char *argv[])
194 194 cdf_handle_error (cstatus);
195 195  
196 196 // fprintf(stdout,"%d %f\n",min[1], (float)min[0]/100.0);
197   - fprintf(stdout,"%f\n",(float)min[0]/10.0);
  197 + fprintf(stdout,"%f\n",(float)min[0]/1000.0);
198 198 }
... ...