OSDN Git Service

mrcImagePyramid 修正 part2 master
authorakyg5327 <enokida.yuya827@mail.kyutech.jp>
Tue, 30 Jan 2024 07:10:31 +0000 (16:10 +0900)
committerakyg5327 <enokida.yuya827@mail.kyutech.jp>
Tue, 30 Jan 2024 07:10:31 +0000 (16:10 +0900)
src/Tools/mrcImage/mrcImagePyramid/src/mrcImagePyramid.c
src/Tools/mrcImage/mrcImagePyramid/src/test/nohup.out [new file with mode: 0644]
src/Tools/mrcImage/mrcImagePyramid/src/test/test.flow
src/Tools/mrcImage/mrcImagePyramid/src/test/test.histgram
src/Tools/mrcImage/mrcImagePyramid/src/test/test.u
src/Tools/mrcImage/mrcImagePyramid/src/test/test.v
src/Tools/mrcImage/mrcImagePyramid/src/test/test.w

index a6041ee..1e363c6 100755 (executable)
@@ -243,7 +243,7 @@ int main(int argc, char* argv[])
                                mrcPixelDataSet(&tmpu[i], x, y, z, 0, mrcPixelRePart);
                                                mrcPixelDataSet(&tmpv[i], x, y, z, 0, mrcPixelRePart);
                                mrcPixelDataSet(&tmpw[i], x, y, z, 0, mrcPixelRePart);
-                                       mrcPixelDataSet(&outFlow, x, y, z, 0, mrcPixelRePart);
+                                       //mrcPixelDataSet(&outFlow, x, y, z, 0, mrcPixelRePart);
                                        } else {
 
                                                count = 0;
@@ -300,7 +300,7 @@ int main(int argc, char* argv[])
                                                mrcPixelDataSet(&(tmpu[i]), x, y, z, u, mrcPixelRePart);
                                                mrcPixelDataSet(&(tmpv[i]), x, y, z, v, mrcPixelRePart);
                                                mrcPixelDataSet(&(tmpw[i]), x, y, z, w, mrcPixelRePart);
-                                               mrcPixelDataSet(&outFlow, x, y, z, size, mrcPixelRePart);
+                                               //mrcPixelDataSet(&outFlow, x, y, z, size, mrcPixelRePart);
                                        
                                                u = 2 * u;
                                                v = 2 * v;
@@ -310,57 +310,59 @@ int main(int argc, char* argv[])
                                                mrcPixelDataSet(&(tmpv[i-1]), 2*x, 2*y, 2*z, v, mrcPixelRePart);
                                                mrcPixelDataSet(&(tmpw[i-1]), 2*x, 2*y, 2*z, w, mrcPixelRePart);
 
-
+                                       }
+                               }
+                       }
+               }
 //////////////////////////////////計算した速度を2倍して高い解像度のわたす/////////////////////////////////////////////////////////
 
-                                               for(z = 1; z < In1Shrink[i-1].HeaderN.z; z++){
-                                                       for(y = 1; y < In1Shrink[i-1].HeaderN.y; y++){
-                                                               for(x = 1; x < In1Shrink[i-1].HeaderN.x; x++){
+               for(z = 1; z < In1Shrink[i-1].HeaderN.z; z++){
+                       for(y = 1; y < In1Shrink[i-1].HeaderN.y; y++){
+                               for(x = 1; x < In1Shrink[i-1].HeaderN.x; x++){
 
-                                                                       if((int)x%2 != 0 || (int)y%2 != 0 || (int)z%2 != 0){
+                                       if((int)x%2 != 0 || (int)y%2 != 0 || (int)z%2 != 0){
 
-                                                                               mrcPixelDataGet(&(tmpu[i-1]), x - 1, y    , z    , &data1, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpu[i-1]), x + 1, y    , z    , &data2, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpu[i-1]), x    , y - 1, z    , &data3, mrcPixelRePart, mrcPixelHowNearest);     
-                                                                               mrcPixelDataGet(&(tmpu[i-1]), x    , y + 1, z    , &data4, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpu[i-1]), x    , y    , z - 1, &data5, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpu[i-1]), x    , y    , z + 1, &data6, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpu[i-1]), x - 1, y    , z    , &data1, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpu[i-1]), x + 1, y    , z    , &data2, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpu[i-1]), x    , y - 1, z    , &data3, mrcPixelRePart, mrcPixelHowNearest);     
+                                               mrcPixelDataGet(&(tmpu[i-1]), x    , y + 1, z    , &data4, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpu[i-1]), x    , y    , z - 1, &data5, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpu[i-1]), x    , y    , z + 1, &data6, mrcPixelRePart, mrcPixelHowNearest);
                                                                        
-                                                                               size1 = (data1 + data2 + data3 + data4 + data5 + data6) / 6 ;                       
-
-                                                                               mrcPixelDataGet(&(tmpv[i-1]), x - 1, y    , z    , &data1, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpv[i-1]), x + 1, y    , z    , &data2, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpv[i-1]), x    , y - 1, z    , &data3, mrcPixelRePart, mrcPixelHowNearest);     
-                                                                               mrcPixelDataGet(&(tmpv[i-1]), x    , y + 1, z    , &data4, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpv[i-1]), x    , y    , z - 1, &data5, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpv[i-1]), x    , y    , z + 1, &data6, mrcPixelRePart, mrcPixelHowNearest);
+                                               size1 = (data1 + data2 + data3 + data4 + data5 + data6) / 6 ;                       
+
+                                               mrcPixelDataGet(&(tmpv[i-1]), x - 1, y    , z    , &data1, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpv[i-1]), x + 1, y    , z    , &data2, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpv[i-1]), x    , y - 1, z    , &data3, mrcPixelRePart, mrcPixelHowNearest);     
+                                               mrcPixelDataGet(&(tmpv[i-1]), x    , y + 1, z    , &data4, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpv[i-1]), x    , y    , z - 1, &data5, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpv[i-1]), x    , y    , z + 1, &data6, mrcPixelRePart, mrcPixelHowNearest);
                                                                
-                                                                               size2 = (data1 + data2 + data3 + data4 + data5 + data6) / 6 ; 
-
-                                                                               mrcPixelDataGet(&(tmpw[i-1]), x - 1, y    , z    , &data1, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpw[i-1]), x + 1, y    , z    , &data2, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpw[i-1]), x    , y - 1, z    , &data3, mrcPixelRePart, mrcPixelHowNearest);     
-                                                                               mrcPixelDataGet(&(tmpw[i-1]), x    , y + 1, z    , &data4, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpw[i-1]), x    , y    , z - 1, &data5, mrcPixelRePart, mrcPixelHowNearest);
-                                                                               mrcPixelDataGet(&(tmpw[i-1]), x    , y    , z + 1, &data6, mrcPixelRePart, mrcPixelHowNearest);
+                                               size2 = (data1 + data2 + data3 + data4 + data5 + data6) / 6 ; 
+
+                                               mrcPixelDataGet(&(tmpw[i-1]), x - 1, y    , z    , &data1, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpw[i-1]), x + 1, y    , z    , &data2, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpw[i-1]), x    , y - 1, z    , &data3, mrcPixelRePart, mrcPixelHowNearest);     
+                                               mrcPixelDataGet(&(tmpw[i-1]), x    , y + 1, z    , &data4, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpw[i-1]), x    , y    , z - 1, &data5, mrcPixelRePart, mrcPixelHowNearest);
+                                               mrcPixelDataGet(&(tmpw[i-1]), x    , y    , z + 1, &data6, mrcPixelRePart, mrcPixelHowNearest);
                                                                        
-                                                                               size3 = (data1 + data2 + data3 + data4 + data5 + data6) / 6 ;                                                                             
-
-                                                                               mrcPixelDataSet(&(tmpu[i-1]), x, y, z, size1, mrcPixelRePart);
-                                                                               mrcPixelDataSet(&(tmpv[i-1]), x, y, z, size2, mrcPixelRePart);
-                                                                               mrcPixelDataSet(&(tmpw[i-1]), x, y, z, size3, mrcPixelRePart);
+                                               size3 = (data1 + data2 + data3 + data4 + data5 + data6) / 6 ;                                                                             
 
-                                                                       }
-                                                               }
-                                                       }
-                                               }
+                                               mrcPixelDataSet(&(tmpu[i-1]), x, y, z, size1, mrcPixelRePart);
+                                               mrcPixelDataSet(&(tmpv[i-1]), x, y, z, size2, mrcPixelRePart);
+                                               mrcPixelDataSet(&(tmpw[i-1]), x, y, z, size3, mrcPixelRePart);
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 
                                        }
                                }
                        }
                }
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 
        }
+               //      }
+       //      }
+//     }
 
        gsl_matrix_free(m);
     gsl_matrix_free(b);
diff --git a/src/Tools/mrcImage/mrcImagePyramid/src/test/nohup.out b/src/Tools/mrcImage/mrcImagePyramid/src/test/nohup.out
new file mode 100644 (file)
index 0000000..e69de29
index f829012..f93513e 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImagePyramid/src/test/test.flow and b/src/Tools/mrcImage/mrcImagePyramid/src/test/test.flow differ
index b3a6b8a..e69de29 100755 (executable)
-  0               0         1007.98         1007.98 
-  1      0.00974882               0               0 
-  2       0.0194976               0               0 
-  3       0.0292465               0               0 
-  4       0.0389953               0               0 
-  5       0.0487441               0               0 
-  6       0.0584929               0               0 
-  7       0.0682417               0               0 
-  8       0.0779906               0               0 
-  9       0.0877394               0               0 
- 10       0.0974882               0               0 
- 11        0.107237               0               0 
- 12        0.116986               0               0 
- 13        0.126735               0               0 
- 14        0.136483               0               0 
- 15        0.146232               0               0 
- 16        0.155981               0               0 
- 17         0.16573               0               0 
- 18        0.175479               0               0 
- 19        0.185228               0               0 
- 20        0.194976               0               0 
- 21        0.204725               0               0 
- 22        0.214474               0               0 
- 23        0.224223               0               0 
- 24        0.233972               0               0 
- 25         0.24372               0               0 
- 26        0.253469               0               0 
- 27        0.263218               0               0 
- 28        0.272967               0               0 
- 29        0.282716               0               0 
- 30        0.292465               0               0 
- 31        0.302213               0               0 
- 32        0.311962               0               0 
- 33        0.321711               0               0 
- 34         0.33146               0               0 
- 35        0.341209               0               0 
- 36        0.350957               0               0 
- 37        0.360706               0               0 
- 38        0.370455               0               0 
- 39        0.380204               0               0 
- 40        0.389953               0               0 
- 41        0.399702               0               0 
- 42         0.40945               0               0 
- 43        0.419199               0               0 
- 44        0.428948               0               0 
- 45        0.438697               0               0 
- 46        0.448446               0               0 
- 47        0.458195               0               0 
- 48        0.467943               0               0 
- 49        0.477692               0               0 
- 50        0.487441               0               0 
- 51         0.49719               0               0 
- 52        0.506939               0               0 
- 53        0.516687               0               0 
- 54        0.526436               0               0 
- 55        0.536185               0               0 
- 56        0.545934               0               0 
- 57        0.555683               0               0 
- 58        0.565432               0               0 
- 59         0.57518               0               0 
- 60        0.584929               0               0 
- 61        0.594678               0               0 
- 62        0.604427               0               0 
- 63        0.614176               0               0 
- 64        0.623924               0               0 
- 65        0.633673               0               0 
- 66        0.643422               0               0 
- 67        0.653171               0               0 
- 68         0.66292               0               0 
- 69        0.672669               0               0 
- 70        0.682417               0               0 
- 71        0.692166               0               0 
- 72        0.701915               0               0 
- 73        0.711664               0               0 
- 74        0.721413               0               0 
- 75        0.731161               0               0 
- 76         0.74091               0               0 
- 77        0.750659               0               0 
- 78        0.760408               0               0 
- 79        0.770157               0               0 
- 80        0.779906               0               0 
- 81        0.789654               0               0 
- 82        0.799403               0               0 
- 83        0.809152               0               0 
- 84        0.818901               0               0 
- 85         0.82865               0               0 
- 86        0.838398               0               0 
- 87        0.848147               0               0 
- 88        0.857896               0               0 
- 89        0.867645               0               0 
- 90        0.877394               0               0 
- 91        0.887143               0               0 
- 92        0.896891               0               0 
- 93         0.90664               0               0 
- 94        0.916389               0               0 
- 95        0.926138               0               0 
- 96        0.935887               0               0 
- 97        0.945635               0               0 
- 98        0.955384               0               0 
- 99        0.965133               0               0 
-100        0.974882               0               0 
-101        0.984631               0               0 
-102         0.99438               0               0 
-103         1.00413               0               0 
-104         1.01388               0               0 
-105         1.02363               0               0 
-106         1.03337               0               0 
-107         1.04312               0               0 
-108         1.05287               0               0 
-109         1.06262               0               0 
-110         1.07237               0               0 
-111         1.08212               0               0 
-112         1.09187               0               0 
-113         1.10162               0               0 
-114         1.11137               0               0 
-115         1.12111               0               0 
-116         1.13086               0               0 
-117         1.14061               0               0 
-118         1.15036               0               0 
-119         1.16011               0               0 
-120         1.16986               0               0 
-121         1.17961               0               0 
-122         1.18936               0               0 
-123          1.1991               0               0 
-124         1.20885               0               0 
-125          1.2186               0               0 
-126         1.22835               0               0 
-127          1.2381               0               0 
-128         1.24785               0               0 
-129          1.2576               0               0 
-130         1.26735               0               0 
-131          1.2771               0               0 
-132         1.28684               0               0 
-133         1.29659               0               0 
-134         1.30634               0               0 
-135         1.31609               0               0 
-136         1.32584               0               0 
-137         1.33559               0               0 
-138         1.34534               0               0 
-139         1.35509               0               0 
-140         1.36483               0               0 
-141         1.37458               0               0 
-142         1.38433               0               0 
-143         1.39408               0               0 
-144         1.40383               0               0 
-145         1.41358               0               0 
-146         1.42333               0               0 
-147         1.43308               0               0 
-148         1.44283               0               0 
-149         1.45257               0               0 
-150         1.46232               0               0 
-151         1.47207               0               0 
-152         1.48182               0               0 
-153         1.49157               0               0 
-154         1.50132               0               0 
-155         1.51107               0               0 
-156         1.52082               0               0 
-157         1.53056               0               0 
-158         1.54031               0               0 
-159         1.55006               0               0 
-160         1.55981               0               0 
-161         1.56956               0               0 
-162         1.57931               0               0 
-163         1.58906               0               0 
-164         1.59881               0               0 
-165         1.60856               0               0 
-166          1.6183               0               0 
-167         1.62805               0               0 
-168          1.6378               0               0 
-169         1.64755               0               0 
-170          1.6573               0               0 
-171         1.66705               0               0 
-172          1.6768               0               0 
-173         1.68655               0               0 
-174         1.69629               0               0 
-175         1.70604               0               0 
-176         1.71579               0               0 
-177         1.72554               0               0 
-178         1.73529               0               0 
-179         1.74504               0               0 
-180         1.75479               0               0 
-181         1.76454               0               0 
-182         1.77429               0               0 
-183         1.78403               0               0 
-184         1.79378               0               0 
-185         1.80353               0               0 
-186         1.81328               0               0 
-187         1.82303               0               0 
-188         1.83278               0               0 
-189         1.84253               0               0 
-190         1.85228               0               0 
-191         1.86202               0               0 
-192         1.87177               0               0 
-193         1.88152               0               0 
-194         1.89127               0               0 
-195         1.90102               0               0 
-196         1.91077               0               0 
-197         1.92052               0               0 
-198         1.93027               0               0 
-199         1.94002               0               0 
-200         1.94976               0               0 
-201         1.95951               0               0 
-202         1.96926               0               0 
-203         1.97901               0               0 
-204         1.98876               0               0 
-205         1.99851               0               0 
-206         2.00826               0               0 
-207         2.01801               0               0 
-208         2.02775               0               0 
-209          2.0375               0               0 
-210         2.04725               0               0 
-211           2.057               0               0 
-212         2.06675               0               0 
-213          2.0765               0               0 
-214         2.08625               0               0 
-215           2.096               0               0 
-216         2.10574               0               0 
-217         2.11549               0               0 
-218         2.12524               0               0 
-219         2.13499               0               0 
-220         2.14474               0               0 
-221         2.15449               0               0 
-222         2.16424               0               0 
-223         2.17399               0               0 
-224         2.18374               0               0 
-225         2.19348               0               0 
-226         2.20323               0               0 
-227         2.21298               0               0 
-228         2.22273               0               0 
-229         2.23248               0               0 
-230         2.24223               0               0 
-231         2.25198               0               0 
-232         2.26173               0               0 
-233         2.27147               0               0 
-234         2.28122               0               0 
-235         2.29097               0               0 
-236         2.30072               0               0 
-237         2.31047               0               0 
-238         2.32022               0               0 
-239         2.32997               0               0 
-240         2.33972               0               0 
-241         2.34947               0               0 
-242         2.35921               0               0 
-243         2.36896               0               0 
-244         2.37871               0               0 
-245         2.38846               0               0 
-246         2.39821               0               0 
-247         2.40796               0               0 
-248         2.41771               0               0 
-249         2.42746               0               0 
-250          2.4372               0               0 
-251         2.44695               0               0 
-252          2.4567               0               0 
-253         2.46645               0               0 
-254          2.4762               0               0 
-255         2.48595               0               0 
-256          2.4957               0               0 
-257         2.50545               0               0 
-258          2.5152               0               0 
-259         2.52494               0               0 
-260         2.53469               0               0 
-261         2.54444               0               0 
-262         2.55419               0               0 
-263         2.56394               0               0 
-264         2.57369               0               0 
-265         2.58344               0               0 
-266         2.59319               0               0 
-267         2.60293               0               0 
-268         2.61268               0               0 
-269         2.62243               0               0 
-270         2.63218               0               0 
-271         2.64193               0               0 
-272         2.65168               0               0 
-273         2.66143               0               0 
-274         2.67118               0               0 
-275         2.68093               0               0 
-276         2.69067               0               0 
-277         2.70042               0               0 
-278         2.71017               0               0 
-279         2.71992               0               0 
-280         2.72967               0               0 
-281         2.73942               0               0 
-282         2.74917               0               0 
-283         2.75892               0               0 
-284         2.76866               0               0 
-285         2.77841               0               0 
-286         2.78816               0               0 
-287         2.79791               0               0 
-288         2.80766               0               0 
-289         2.81741               0               0 
-290         2.82716               0               0 
-291         2.83691               0               0 
-292         2.84666               0               0 
-293          2.8564               0               0 
-294         2.86615               0               0 
-295          2.8759               0               0 
-296         2.88565               0               0 
-297          2.8954               0               0 
-298         2.90515               0               0 
-299          2.9149               0               0 
-300         2.92465               0               0 
-301         2.93439               0               0 
-302         2.94414               0               0 
-303         2.95389               0               0 
-304         2.96364               0               0 
-305         2.97339               0               0 
-306         2.98314               0               0 
-307         2.99289               0               0 
-308         3.00264               0               0 
-309         3.01239               0               0 
-310         3.02213               0               0 
-311         3.03188               0               0 
-312         3.04163               0               0 
-313         3.05138               0               0 
-314         3.06113               0               0 
-315         3.07088               0               0 
-316         3.08063               0               0 
-317         3.09038               0               0 
-318         3.10012               0               0 
-319         3.10987               0               0 
-320         3.11962               0               0 
-321         3.12937               0               0 
-322         3.13912               0               0 
-323         3.14887               0               0 
-324         3.15862               0               0 
-325         3.16837               0               0 
-326         3.17812               0               0 
-327         3.18786               0               0 
-328         3.19761               0               0 
-329         3.20736               0               0 
-330         3.21711               0               0 
-331         3.22686               0               0 
-332         3.23661               0               0 
-333         3.24636               0               0 
-334         3.25611               0               0 
-335         3.26585               0               0 
-336          3.2756               0               0 
-337         3.28535               0               0 
-338          3.2951               0               0 
-339         3.30485               0               0 
-340          3.3146               0               0 
-341         3.32435               0               0 
-342          3.3341               0               0 
-343         3.34384               0               0 
-344         3.35359               0               0 
-345         3.36334               0               0 
-346         3.37309               0               0 
-347         3.38284               0               0 
-348         3.39259               0               0 
-349         3.40234               0               0 
-350         3.41209               0               0 
-351         3.42184               0               0 
-352         3.43158               0               0 
-353         3.44133               0               0 
-354         3.45108               0               0 
-355         3.46083               0               0 
-356         3.47058               0               0 
-357         3.48033               0               0 
-358         3.49008               0               0 
-359         3.49983               0               0 
-360         3.50957               0               0 
-361         3.51932               0               0 
-362         3.52907               0               0 
-363         3.53882               0               0 
-364         3.54857               0               0 
-365         3.55832               0               0 
-366         3.56807               0               0 
-367         3.57782               0               0 
-368         3.58757               0               0 
-369         3.59731               0               0 
-370         3.60706               0               0 
-371         3.61681               0               0 
-372         3.62656               0               0 
-373         3.63631               0               0 
-374         3.64606               0               0 
-375         3.65581               0               0 
-376         3.66556               0               0 
-377          3.6753               0               0 
-378         3.68505               0               0 
-379          3.6948               0               0 
-380         3.70455               0               0 
-381          3.7143               0               0 
-382         3.72405               0               0 
-383          3.7338               0               0 
-384         3.74355               0               0 
-385          3.7533               0               0 
-386         3.76304               0               0 
-387         3.77279               0               0 
-388         3.78254               0               0 
-389         3.79229               0               0 
-390         3.80204               0               0 
-391         3.81179               0               0 
-392         3.82154               0               0 
-393         3.83129               0               0 
-394         3.84103               0               0 
-395         3.85078               0               0 
-396         3.86053               0               0 
-397         3.87028               0               0 
-398         3.88003               0               0 
-399         3.88978               0               0 
-400         3.89953               0               0 
-401         3.90928               0               0 
-402         3.91903               0               0 
-403         3.92877               0               0 
-404         3.93852               0               0 
-405         3.94827               0               0 
-406         3.95802               0               0 
-407         3.96777               0               0 
-408         3.97752               0               0 
-409         3.98727               0               0 
-410         3.99702               0               0 
-411         4.00676               0               0 
-412         4.01651               0               0 
-413         4.02626               0               0 
-414         4.03601               0               0 
-415         4.04576               0               0 
-416         4.05551               0               0 
-417         4.06526               0               0 
-418         4.07501               0               0 
-419         4.08476               0               0 
-420          4.0945               0               0 
-421         4.10425               0               0 
-422           4.114               0               0 
-423         4.12375               0               0 
-424          4.1335               0               0 
-425         4.14325               0               0 
-426           4.153               0               0 
-427         4.16275               0               0 
-428         4.17249               0               0 
-429         4.18224               0               0 
-430         4.19199               0               0 
-431         4.20174               0               0 
-432         4.21149               0               0 
-433         4.22124               0               0 
-434         4.23099               0               0 
-435         4.24074               0               0 
-436         4.25049               0               0 
-437         4.26023               0               0 
-438         4.26998               0               0 
-439         4.27973               0               0 
-440         4.28948               0               0 
-441         4.29923               0               0 
-442         4.30898               0               0 
-443         4.31873               0               0 
-444         4.32848               0               0 
-445         4.33822               0               0 
-446         4.34797               0               0 
-447         4.35772               0               0 
-448         4.36747               0               0 
-449         4.37722               0               0 
-450         4.38697               0               0 
-451         4.39672               0               0 
-452         4.40647               0               0 
-453         4.41622               0               0 
-454         4.42596               0               0 
-455         4.43571               0               0 
-456         4.44546               0               0 
-457         4.45521               0               0 
-458         4.46496               0               0 
-459         4.47471               0               0 
-460         4.48446               0               0 
-461         4.49421               0               0 
-462         4.50395               0               0 
-463          4.5137               0               0 
-464         4.52345               0               0 
-465          4.5332               0               0 
-466         4.54295               0               0 
-467          4.5527               0               0 
-468         4.56245               0               0 
-469          4.5722               0               0 
-470         4.58195               0               0 
-471         4.59169               0               0 
-472         4.60144               0               0 
-473         4.61119               0               0 
-474         4.62094               0               0 
-475         4.63069               0               0 
-476         4.64044               0               0 
-477         4.65019               0               0 
-478         4.65994               0               0 
-479         4.66968               0               0 
-480         4.67943               0               0 
-481         4.68918               0               0 
-482         4.69893               0               0 
-483         4.70868               0               0 
-484         4.71843               0               0 
-485         4.72818               0               0 
-486         4.73793               0               0 
-487         4.74767               0               0 
-488         4.75742               0               0 
-489         4.76717               0               0 
-490         4.77692               0               0 
-491         4.78667               0               0 
-492         4.79642               0               0 
-493         4.80617               0               0 
-494         4.81592               0               0 
-495         4.82567               0               0 
-496         4.83541               0               0 
-497         4.84516               0               0 
-498         4.85491               0               0 
-499         4.86466               0               0 
-500         4.87441               0               0 
-501         4.88416               0               0 
-502         4.89391               0               0 
-503         4.90366               0               0 
-504          4.9134               0               0 
-505         4.92315               0               0 
-506          4.9329               0               0 
-507         4.94265               0               0 
-508          4.9524               0               0 
-509         4.96215               0               0 
-510          4.9719               0               0 
-511         4.98165               0               0 
-512          4.9914               0               0 
-513         5.00114               0               0 
-514         5.01089               0               0 
-515         5.02064               0               0 
-516         5.03039               0               0 
-517         5.04014               0               0 
-518         5.04989               0               0 
-519         5.05964               0               0 
-520         5.06939               0               0 
-521         5.07913               0               0 
-522         5.08888               0               0 
-523         5.09863               0               0 
-524         5.10838               0               0 
-525         5.11813               0               0 
-526         5.12788               0               0 
-527         5.13763               0               0 
-528         5.14738               0               0 
-529         5.15713               0               0 
-530         5.16687               0               0 
-531         5.17662               0               0 
-532         5.18637               0               0 
-533         5.19612               0               0 
-534         5.20587               0               0 
-535         5.21562               0               0 
-536         5.22537               0               0 
-537         5.23512               0               0 
-538         5.24486               0               0 
-539         5.25461               0               0 
-540         5.26436               0               0 
-541         5.27411               0               0 
-542         5.28386               0               0 
-543         5.29361               0               0 
-544         5.30336               0               0 
-545         5.31311               0               0 
-546         5.32286               0               0 
-547          5.3326               0               0 
-548         5.34235               0               0 
-549          5.3521               0               0 
-550         5.36185               0               0 
-551          5.3716               0               0 
-552         5.38135               0               0 
-553          5.3911               0               0 
-554         5.40085               0               0 
-555         5.41059               0               0 
-556         5.42034               0               0 
-557         5.43009               0               0 
-558         5.43984               0               0 
-559         5.44959               0               0 
-560         5.45934               0               0 
-561         5.46909               0               0 
-562         5.47884               0               0 
-563         5.48859               0               0 
-564         5.49833               0               0 
-565         5.50808               0               0 
-566         5.51783               0               0 
-567         5.52758               0               0 
-568         5.53733               0               0 
-569         5.54708               0               0 
-570         5.55683               0               0 
-571         5.56658               0               0 
-572         5.57632               0               0 
-573         5.58607               0               0 
-574         5.59582               0               0 
-575         5.60557               0               0 
-576         5.61532               0               0 
-577         5.62507               0               0 
-578         5.63482               0               0 
-579         5.64457               0               0 
-580         5.65432               0               0 
-581         5.66406               0               0 
-582         5.67381               0               0 
-583         5.68356               0               0 
-584         5.69331               0               0 
-585         5.70306               0               0 
-586         5.71281               0               0 
-587         5.72256               0               0 
-588         5.73231               0               0 
-589         5.74205               0               0 
-590          5.7518               0               0 
-591         5.76155               0               0 
-592          5.7713               0               0 
-593         5.78105               0               0 
-594          5.7908               0               0 
-595         5.80055               0               0 
-596          5.8103               0               0 
-597         5.82005               0               0 
-598         5.82979               0               0 
-599         5.83954               0               0 
-600         5.84929               0               0 
-601         5.85904               0               0 
-602         5.86879               0               0 
-603         5.87854               0               0 
-604         5.88829               0               0 
-605         5.89804               0               0 
-606         5.90778               0               0 
-607         5.91753               0               0 
-608         5.92728               0               0 
-609         5.93703               0               0 
-610         5.94678               0               0 
-611         5.95653               0               0 
-612         5.96628               0               0 
-613         5.97603               0               0 
-614         5.98578               0               0 
-615         5.99552               0               0 
-616         6.00527               0               0 
-617         6.01502               0               0 
-618         6.02477               0               0 
-619         6.03452               0               0 
-620         6.04427               0               0 
-621         6.05402               0               0 
-622         6.06377               0               0 
-623         6.07351               0               0 
-624         6.08326               0               0 
-625         6.09301               0               0 
-626         6.10276               0               0 
-627         6.11251               0               0 
-628         6.12226               0               0 
-629         6.13201               0               0 
-630         6.14176               0               0 
-631          6.1515               0               0 
-632         6.16125               0               0 
-633           6.171               0               0 
-634         6.18075               0               0 
-635          6.1905               0               0 
-636         6.20025               0               0 
-637            6.21               0               0 
-638         6.21975               0               0 
-639          6.2295               0               0 
-640         6.23924               0               0 
-641         6.24899               0               0 
-642         6.25874               0               0 
-643         6.26849               0               0 
-644         6.27824               0               0 
-645         6.28799               0               0 
-646         6.29774               0               0 
-647         6.30749               0               0 
-648         6.31723               0               0 
-649         6.32698               0               0 
-650         6.33673               0               0 
-651         6.34648               0               0 
-652         6.35623               0               0 
-653         6.36598               0               0 
-654         6.37573               0               0 
-655         6.38548               0               0 
-656         6.39523               0               0 
-657         6.40497               0               0 
-658         6.41472               0               0 
-659         6.42447               0               0 
-660         6.43422               0               0 
-661         6.44397               0               0 
-662         6.45372               0               0 
-663         6.46347               0               0 
-664         6.47322               0               0 
-665         6.48296               0               0 
-666         6.49271               0               0 
-667         6.50246               0               0 
-668         6.51221               0               0 
-669         6.52196               0               0 
-670         6.53171               0               0 
-671         6.54146               0               0 
-672         6.55121               0               0 
-673         6.56096               0               0 
-674          6.5707               0               0 
-675         6.58045               0               0 
-676          6.5902               0               0 
-677         6.59995               0               0 
-678          6.6097               0               0 
-679         6.61945               0               0 
-680          6.6292               0               0 
-681         6.63895               0               0 
-682         6.64869               0               0 
-683         6.65844               0               0 
-684         6.66819               0               0 
-685         6.67794               0               0 
-686         6.68769               0               0 
-687         6.69744               0               0 
-688         6.70719               0               0 
-689         6.71694               0               0 
-690         6.72669               0               0 
-691         6.73643               0               0 
-692         6.74618               0               0 
-693         6.75593               0               0 
-694         6.76568               0               0 
-695         6.77543               0               0 
-696         6.78518               0               0 
-697         6.79493               0               0 
-698         6.80468               0               0 
-699         6.81442               0               0 
-700         6.82417               0               0 
-701         6.83392               0               0 
-702         6.84367               0               0 
-703         6.85342               0               0 
-704         6.86317               0               0 
-705         6.87292               0               0 
-706         6.88267               0               0 
-707         6.89242               0               0 
-708         6.90216               0               0 
-709         6.91191               0               0 
-710         6.92166               0               0 
-711         6.93141               0               0 
-712         6.94116               0               0 
-713         6.95091               0               0 
-714         6.96066               0               0 
-715         6.97041               0               0 
-716         6.98015               0               0 
-717          6.9899               0               0 
-718         6.99965               0               0 
-719          7.0094               0               0 
-720         7.01915               0               0 
-721          7.0289               0               0 
-722         7.03865               0               0 
-723          7.0484               0               0 
-724         7.05815               0               0 
-725         7.06789               0               0 
-726         7.07764               0               0 
-727         7.08739               0               0 
-728         7.09714               0               0 
-729         7.10689               0               0 
-730         7.11664               0               0 
-731         7.12639               0               0 
-732         7.13614               0               0 
-733         7.14588               0               0 
-734         7.15563               0               0 
-735         7.16538               0               0 
-736         7.17513               0               0 
-737         7.18488               0               0 
-738         7.19463               0               0 
-739         7.20438               0               0 
-740         7.21413               0               0 
-741         7.22388               0               0 
-742         7.23362               0               0 
-743         7.24337               0               0 
-744         7.25312               0               0 
-745         7.26287               0               0 
-746         7.27262               0               0 
-747         7.28237               0               0 
-748         7.29212               0               0 
-749         7.30187               0               0 
-750         7.31161               0               0 
-751         7.32136               0               0 
-752         7.33111               0               0 
-753         7.34086               0               0 
-754         7.35061               0               0 
-755         7.36036               0               0 
-756         7.37011               0               0 
-757         7.37986               0               0 
-758          7.3896               0               0 
-759         7.39935               0               0 
-760          7.4091               0               0 
-761         7.41885               0               0 
-762          7.4286               0               0 
-763         7.43835               0               0 
-764          7.4481               0               0 
-765         7.45785               0               0 
-766          7.4676               0               0 
-767         7.47734               0               0 
-768         7.48709               0               0 
-769         7.49684               0               0 
-770         7.50659               0               0 
-771         7.51634               0               0 
-772         7.52609               0               0 
-773         7.53584               0               0 
-774         7.54559               0               0 
-775         7.55533               0               0 
-776         7.56508               0               0 
-777         7.57483               0               0 
-778         7.58458               0               0 
-779         7.59433               0               0 
-780         7.60408               0               0 
-781         7.61383               0               0 
-782         7.62358               0               0 
-783         7.63333               0               0 
-784         7.64307               0               0 
-785         7.65282               0               0 
-786         7.66257               0               0 
-787         7.67232               0               0 
-788         7.68207               0               0 
-789         7.69182               0               0 
-790         7.70157               0               0 
-791         7.71132               0               0 
-792         7.72106               0               0 
-793         7.73081               0               0 
-794         7.74056               0               0 
-795         7.75031               0               0 
-796         7.76006               0               0 
-797         7.76981               0               0 
-798         7.77956               0               0 
-799         7.78931               0               0 
-800         7.79906               0               0 
-801          7.8088               0               0 
-802         7.81855               0               0 
-803          7.8283               0               0 
-804         7.83805               0               0 
-805          7.8478               0               0 
-806         7.85755               0               0 
-807          7.8673               0               0 
-808         7.87705               0               0 
-809         7.88679               0               0 
-810         7.89654               0               0 
-811         7.90629               0               0 
-812         7.91604               0               0 
-813         7.92579               0               0 
-814         7.93554               0               0 
-815         7.94529               0               0 
-816         7.95504               0               0 
-817         7.96479               0               0 
-818         7.97453               0               0 
-819         7.98428               0               0 
-820         7.99403               0               0 
-821         8.00378               0               0 
-822         8.01353               0               0 
-823         8.02328               0               0 
-824         8.03303               0               0 
-825         8.04278               0               0 
-826         8.05252               0               0 
-827         8.06227               0               0 
-828         8.07202               0               0 
-829         8.08177               0               0 
-830         8.09152               0               0 
-831         8.10127               0               0 
-832         8.11102               0               0 
-833         8.12077               0               0 
-834         8.13052               0               0 
-835         8.14026               0               0 
-836         8.15001               0               0 
-837         8.15976               0               0 
-838         8.16951               0               0 
-839         8.17926               0               0 
-840         8.18901               0               0 
-841         8.19876               0               0 
-842         8.20851               0               0 
-843         8.21825               0               0 
-844           8.228               0               0 
-845         8.23775               0               0 
-846          8.2475               0               0 
-847         8.25725               0               0 
-848           8.267               0               0 
-849         8.27675               0               0 
-850          8.2865               0               0 
-851         8.29625               0               0 
-852         8.30599               0               0 
-853         8.31574               0               0 
-854         8.32549               0               0 
-855         8.33524               0               0 
-856         8.34499               0               0 
-857         8.35474               0               0 
-858         8.36449               0               0 
-859         8.37424               0               0 
-860         8.38398               0               0 
-861         8.39373               0               0 
-862         8.40348               0               0 
-863         8.41323               0               0 
-864         8.42298               0               0 
-865         8.43273               0               0 
-866         8.44248               0               0 
-867         8.45223               0               0 
-868         8.46198               0               0 
-869         8.47172               0               0 
-870         8.48147               0               0 
-871         8.49122               0               0 
-872         8.50097               0               0 
-873         8.51072               0               0 
-874         8.52047               0               0 
-875         8.53022               0               0 
-876         8.53997               0               0 
-877         8.54971               0               0 
-878         8.55946               0               0 
-879         8.56921               0               0 
-880         8.57896               0               0 
-881         8.58871               0               0 
-882         8.59846               0               0 
-883         8.60821               0               0 
-884         8.61796               0               0 
-885         8.62771               0               0 
-886         8.63745               0               0 
-887          8.6472               0               0 
-888         8.65695               0               0 
-889          8.6667               0               0 
-890         8.67645               0               0 
-891          8.6862               0               0 
-892         8.69595               0               0 
-893          8.7057               0               0 
-894         8.71544               0               0 
-895         8.72519               0               0 
-896         8.73494               0               0 
-897         8.74469               0               0 
-898         8.75444               0               0 
-899         8.76419               0               0 
-900         8.77394               0               0 
-901         8.78369               0               0 
-902         8.79343               0               0 
-903         8.80318               0               0 
-904         8.81293               0               0 
-905         8.82268               0               0 
-906         8.83243               0               0 
-907         8.84218               0               0 
-908         8.85193               0               0 
-909         8.86168               0               0 
-910         8.87143               0               0 
-911         8.88117               0               0 
-912         8.89092               0               0 
-913         8.90067               0               0 
-914         8.91042               0               0 
-915         8.92017               0               0 
-916         8.92992               0               0 
-917         8.93967               0               0 
-918         8.94942               0               0 
-919         8.95916               0               0 
-920         8.96891               0               0 
-921         8.97866               0               0 
-922         8.98841               0               0 
-923         8.99816               0               0 
-924         9.00791               0               0 
-925         9.01766               0               0 
-926         9.02741               0               0 
-927         9.03716               0               0 
-928          9.0469               0               0 
-929         9.05665               0               0 
-930          9.0664               0               0 
-931         9.07615               0               0 
-932          9.0859               0               0 
-933         9.09565               0               0 
-934          9.1054               0               0 
-935         9.11515               0               0 
-936         9.12489               0               0 
-937         9.13464               0               0 
-938         9.14439               0               0 
-939         9.15414               0               0 
-940         9.16389               0               0 
-941         9.17364               0               0 
-942         9.18339               0               0 
-943         9.19314               0               0 
-944         9.20289               0               0 
-945         9.21263               0               0 
-946         9.22238               0               0 
-947         9.23213               0               0 
-948         9.24188               0               0 
-949         9.25163               0               0 
-950         9.26138               0               0 
-951         9.27113               0               0 
-952         9.28088               0               0 
-953         9.29062               0               0 
-954         9.30037               0               0 
-955         9.31012               0               0 
-956         9.31987               0               0 
-957         9.32962               0               0 
-958         9.33937               0               0 
-959         9.34912               0               0 
-960         9.35887               0               0 
-961         9.36862               0               0 
-962         9.37836               0               0 
-963         9.38811               0               0 
-964         9.39786               0               0 
-965         9.40761               0               0 
-966         9.41736               0               0 
-967         9.42711               0               0 
-968         9.43686               0               0 
-969         9.44661               0               0 
-970         9.45635               0               0 
-971          9.4661               0               0 
-972         9.47585               0               0 
-973          9.4856               0               0 
-974         9.49535               0               0 
-975          9.5051               0               0 
-976         9.51485               0               0 
-977          9.5246               0               0 
-978         9.53435               0               0 
-979         9.54409               0               0 
-980         9.55384               0               0 
-981         9.56359               0               0 
-982         9.57334               0               0 
-983         9.58309               0               0 
-984         9.59284               0               0 
-985         9.60259               0               0 
-986         9.61234               0               0 
-987         9.62208               0               0 
-988         9.63183               0               0 
-989         9.64158               0               0 
-990         9.65133               0               0 
-991         9.66108               0               0 
-992         9.67083               0               0 
-993         9.68058               0               0 
-994         9.69033               0               0 
-995         9.70008               0               0 
-996         9.70982               0               0 
-997         9.71957               0               0 
-998         9.72932               0               0 
-999         9.73907               0               0 
index 765aba2..e69de29 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImagePyramid/src/test/test.u and b/src/Tools/mrcImage/mrcImagePyramid/src/test/test.u differ
index 59dae20..e69de29 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImagePyramid/src/test/test.v and b/src/Tools/mrcImage/mrcImagePyramid/src/test/test.v differ
index 6e50af6..e69de29 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImagePyramid/src/test/test.w and b/src/Tools/mrcImage/mrcImagePyramid/src/test/test.w differ