Skip to content

Commit

Permalink
Refs #5133 Removed tied variable dependence
Browse files Browse the repository at this point in the history
1. Errors reported when variables are tied are way too big
2. Added constraints to restrict range for the variables
3. Default now is to NOT calculate variances( Used complex tied formula)
4. Improved initial parameters a bit.
5. Updated test programs to reflect new values.
6. Improved derivatives in the case (co)variances were calculated.

7. Added a new column to the output table for IntegratePeakTimeSlices to list the
   specID's used to calcualte the integrated intensities.
  • Loading branch information
RuthFromDuluth committed Apr 22, 2012
1 parent 00f9dbb commit 2563eb1
Show file tree
Hide file tree
Showing 10 changed files with 615 additions and 289 deletions.
141 changes: 0 additions & 141 deletions Code/Mantid/Framework/Crystal/CMakeLists.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
#include "MantidAPI/SpectraDetectorTypes.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidKernel/V3D.h"
#include "MantidAPI/IAlgorithm.h"

using Mantid::API::IAlgorithm_sptr;



Expand Down Expand Up @@ -94,11 +97,11 @@ class DLLExport IntegratePeakTimeSlices: public Mantid::API::Algorithm

bool EdgePeak;

std::string AttributeNames[19];
std::string AttributeNames[20];

std::string ParameterNames[7];

double AttributeValues[19] ;
double AttributeValues[20] ;
double ParameterValues[7] ;

Mantid::detid2index_map * wi_to_detid_map;
Expand Down Expand Up @@ -215,6 +218,8 @@ class DLLExport IntegratePeakTimeSlices: public Mantid::API::Algorithm

bool IsEnoughData( ) ;

std::string CalcConstraints( );


bool debug;
static Kernel::Logger& g_log;
Expand Down
Loading

0 comments on commit 2563eb1

Please sign in to comment.