r15025 - /branches/frame_order_testing/specific_fns/frame_order.py -- December 05, 2011 - 14:40

Author: bugman
Date: Mon Dec  5 14:40:21 2011
New Revision: 15025

URL: http://svn.gna.org/viewcvs/relax?rev=15025&view=rev
Log:
Fix for the calculate method for the frame order theory for the new base data 
design.


Modified:
    branches/frame_order_testing/specific_fns/frame_order.py

Modified: branches/frame_order_testing/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/frame_order.py?rev=15025&r1=15024&r2=15025&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Mon Dec  5 
14:40:21 2011
@@ -1303,23 +1303,17 @@
         @type sim_index:    None or int
         """
 
-        # Assemble the parameter vector.
-        param_vector = self._assemble_param_vector()
-
-        # Get the data structures for optimisation using the tensors as base 
data sets.
-        full_tensors, red_tensors, red_tensor_err, full_in_ref_frame = 
self._minimise_setup_tensors()
-
-        # Set up the optimisation function.
-        target = frame_order.Frame_order(model=cdp.model, 
full_tensors=full_tensors, red_tensors=red_tensors, 
red_errors=red_tensor_err, full_in_ref_frame=full_in_ref_frame)
+        # Set up the target function for direct calculation.
+        model, param_vector, data_types, scaling_matrix = 
self._target_fn_setup(sim_index=sim_index)
 
         # Make a single function call.  This will cause back calculation and 
the data will be stored in the class instance.
-        chi2 = target.func(param_vector)
+        chi2 = model.func(param_vector)
 
         # Set the chi2.
         cdp.chi2 = chi2
 
         # Store the back-calculated tensors.
-        self._store_bc_tensors(target)
+        self._store_bc_tensors(model)
 
 
     def create_mc_data(self, data_id=None):