Changes in src/Actions/AnalysisAction/PointCorrelationAction.cpp [be21fa:f10b0c]

File:

• src/Actions/AnalysisAction/PointCorrelationAction.cpp (modified) (1 diff)

src/Actions/AnalysisAction/PointCorrelationAction.cpp

@@ -50 +50 @@
 
   // execute action
-  output.open(params.outputname.string().c_str());
-  binoutput.open(params.binoutputname.string().c_str());
-  cout << "Point to correlate to is  " << params.Point << endl;
+  output.open(params.outputname.get().string().c_str());
+  binoutput.open(params.binoutputname.get().string().c_str());
+  cout << "Point to correlate to is  " << params.Point.get() << endl;
   CorrelationToPointMap *correlationmap = NULL;
-  for(std::vector<const element *>::iterator iter = params.elements.begin(); iter != params.elements.end(); ++iter)
+  for(std::vector<const element *>::const_iterator iter = params.elements.get().begin(); iter != params.elements.get().end(); ++iter)
     cout << "element is " << (*iter)->getSymbol() << endl;
   std::vector<molecule*> molecules = World::getInstance().getSelectedMolecules();
-  if (params.periodic)
-    correlationmap  = PeriodicCorrelationToPoint(molecules, params.elements, &params.Point, ranges);
+  if (params.periodic.get())
+    correlationmap  = PeriodicCorrelationToPoint(molecules, params.elements.get(), &params.Point.get(), ranges);
   else
-    correlationmap = CorrelationToPoint(molecules, params.elements, &params.Point);
+    correlationmap = CorrelationToPoint(molecules, params.elements.get(), &params.Point.get());
   OutputCorrelationMap<CorrelationToPointMap>(&output, correlationmap, OutputCorrelationToPoint_Header, OutputCorrelationToPoint_Value);
-  binmap = BinData( correlationmap, params.BinWidth, params.BinStart, params.BinEnd );
+  binmap = BinData( correlationmap, params.BinWidth.get(), params.BinStart.get(), params.BinEnd.get() );
   OutputCorrelationMap<BinPairMap> ( &binoutput, binmap, OutputCorrelation_Header, OutputCorrelation_Value );
   delete(binmap);