testing new window_temp design

diff --git a/src/spirals.cpp b/src/spirals.cpp
index d3c23ef04f6591fb7b67a9593e83e96a86a2cdc1..c3dca6524e301ef011ed91042414cccab23edabf 100644 (file)
--- a/src/spirals.cpp
+++ b/src/spirals.cpp
@@ -375,14 +375,12 @@ Spirals::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc,
 {
     const SelectionList &sel = pdata->parallelSelections(sel_);
     std::vector< RVec > temp;
-    std::vector< std::vector< RVec > > window_temp;
-    int window_temp2 = sel_.size() - window + 1;
-
-    temp.resize(sel_.size());
+        temp.resize(sel_.size());
     for (int i = 0; i < sel.size(); i++) {
         copy_rvec(sel[i].position(0).x(), temp[i]);
     }
 
+    int window_temp2 = sel_.size() - window + 1;
     if (window_kernel.size() == 0) {
         window_circles.resize(window_temp2);
         window_kernel.resize(window_temp2);
@@ -390,12 +388,14 @@ Spirals::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc,
             window_circles[i].resize(0);
             window_kernel[i].resize(0);
         }
-        window_temp.resize(window_temp2);
-        for (int i = 0; i < window_temp.size(); i++) {
-            window_temp[i].resize(window);
-            for (int j = 0; j < window; j++) {
-                window_temp[i].push_back(temp[i + j]);
-            }
+    }
+
+    std::vector< std::vector< RVec > > window_temp;
+    window_temp.resize(window_temp2);
+    for (int i = 0; i < window_temp.size(); i++) {
+        window_temp[i].resize(window);
+        for (int j = 0; j < window; j++) {
+            window_temp[i].push_back(temp[i + j]);
         }
     }
 
@@ -412,14 +412,14 @@ Spirals::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc,
 
     std::cout << "global parameters\n";
 
-    /*for (int i = 0; i < window_temp2; i++) {
+    for (int i = 0; i < window_temp2; i++) {
         window_kernel[i].resize(window_kernel[i].size() + 1);
         //make_kernel(window_temp[i], epsi, window_kernel[i]);
         //std::cout << "local kernel parameters " << i << "\n";
         window_circles[i].resize(window_circles[i].size() + 1);
         make_circles(window_circles[i], window_temp[i], window_kernel[i]);
         std::cout << "local circles parameters " << i << "\n";
-    }*/
+    }
 
     /*groups.resize(groups.size() + 1);
     int itemp = circles.back().size() / 2;