Develop and Download Open Source Software

Browse Subversion Repository

Diff of /Conograph/trunk/src/lattice_symmetry/LatticeFigureOfMeritToDisplay.cc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 32 by rtomiyasu, Mon Jul 7 02:35:51 2014 UTC revision 33 by rtomiyasu, Wed Sep 7 04:38:51 2016 UTC
# Line 31  THE SOFTWARE. Line 31  THE SOFTWARE.
31  #include "../PeakPosData.hh"  #include "../PeakPosData.hh"
32  #include "LatticeFigureOfMeritToDisplay.hh"  #include "LatticeFigureOfMeritToDisplay.hh"
33    
34    LatticeFigureOfMeritToDisplay::LatticeFigureOfMeritToDisplay()
35  LatticeFigureOfMeritToDisplay::LatticeFigureOfMeritToDisplay() : m_showsTicks(false)          : m_type_of_reflection_conditions(-1), m_showsTicks(false)
36  {  {
37  }  }
38    
39    
40    void LatticeFigureOfMeritToDisplay::setTypeOfSystematicAbsences(const Int4& arg)
41    {
42            assert(arg < putNumberOfTypesOfSystematicAbsences(this->putLatticeFigureOfMerit().putBravaisType()));
43            m_type_of_reflection_conditions = arg;
44    };
45    
46    
47  void LatticeFigureOfMeritToDisplay::putStandardMillerIndicesToFit(vector< VecDat3<Int4> >& hkl_to_fit,  void LatticeFigureOfMeritToDisplay::putStandardMillerIndicesToFit(vector< VecDat3<Int4> >& hkl_to_fit,
48  vector<bool>& fix_or_fit_flag) const  vector<bool>& fix_or_fit_flag) const
49  {  {
# Line 76  void LatticeFigureOfMeritToDisplay::rese Line 83  void LatticeFigureOfMeritToDisplay::rese
83          qobs_range.begin = 0.0;          qobs_range.begin = 0.0;
84          qobs_range.end = m_qdata.rbegin()->q + sqrt(cv2 * m_qdata.rbegin()->q_var);          qobs_range.end = m_qdata.rbegin()->q + sqrt(cv2 * m_qdata.rbegin()->q_var);
85    
86          m_latfom.putMillerIndicesInRange(qobs_range.end, m_cal_hkl_tray);          m_latfom.putMillerIndicesInRange(qobs_range.end, m_type_of_reflection_conditions, m_cal_hkl_tray);
87          m_associated_hkl_tray.clear();          m_associated_hkl_tray.clear();
88          m_associated_hkl_tray.resize(num_fit_data);          m_associated_hkl_tray.resize(num_fit_data);
89    

Legend:
Removed from v.32  
changed lines
  Added in v.33

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26