changed volumeseries to read/write a volume at a time

film_gls.cc

@@ -47,13 +47,12 @@ int main(int argc, char *argv[])
 
     int sizeTS = x.getNumVolumes();
 
-    // if needed for SUSAN spatial smoothing, output the 12th volume for use later
+    // if needed for SUSAN spatial smoothing, output the halfway volume for use later
     Volume epivol;
     if(globalopts.smoothACEst)
       {
 	epivol = x.getVolume(int(sizeTS/2)).AsColumn();
 	epivol.setInfo(x.getInfo());
-	
 	epivol.writeAsInt(logger.getDir() + "/" + globalopts.epifname);
       }
 
@@ -197,6 +196,12 @@ int main(int argc, char *argv[])
 
     cerr << "Saving results... " << endl;
 
+    // write residuals
+    //residuals.unthresholdSeries(x.getInfo(),x.getPreThresholdPositions());
+    //residuals.writeAsFloat(logger.getDir() + "/res4d");
+    residuals.writeThresholdedSeriesAsFloat(x.getInfo(),x.getPreThresholdPositions(),logger.getDir() + "/res4d");
+    residuals.CleanUp();
+
     if(globalopts.verbose)
       {
 	// output whitened x
@@ -220,11 +225,6 @@ int main(int argc, char *argv[])
     threshac.thresholdSeries();
     threshac.CleanUp();
 
-    // write residuals
-    residuals.unthresholdSeries(x.getInfo(),x.getPreThresholdPositions());
-    residuals.writeAsFloat(logger.getDir() + "/res4d");
-    residuals.CleanUp();
-
     // save gls results:
     glimGls.Save(x.getInfo(), x.getPreThresholdPositions());
     glimGls.CleanUp();