Develop and Download Open Source Software

Powder auto-indexing software Conograph

Browse Subversion Repository

/[conograph]/Conograph/trunk/src/ControlParam.cc

Diff of /Conograph/trunk/src/ControlParam.cc

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

revision 9 by rtomiyasu, Fri Mar 1 09:26:12 2013 UTC revision 16 by rtomiyasu, Fri Apr 26 08:50:24 2013 UTC
# Line 176  ControlParam::ControlParam() Line 176  ControlParam::ControlParam()
176          :          :
177  #ifdef _OPENMP  #ifdef _OPENMP
178                  NumCores_Data(RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),                  NumCores_Data(RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),
179                  RWParamData<Int4>(max(1, omp_get_max_threads()-1), REPLACE_MAX_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) ),                  RWParamData<Int4>(max(1, omp_get_num_procs()-1), REPLACE_MAX_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) ),
180  #else  #else
181                  NumCores_Data(RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),                  NumCores_Data(RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),
182                  RWParamData<Int4>(1, REPLACE_MAX_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) ),                  RWParamData<Int4>(1, REPLACE_MAX_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) ),
183  #endif  #endif
184              IsADorTOF(IsAngleDispersion_Data.second.initial_value),                  ReadConfigurationParameters(true),
185                    IsADorTOF(IsAngleDispersion_Data.second.initial_value),
186                  ConvParam(ConvParam_Data.second.initial_value),                  ConvParam(ConvParam_Data.second.initial_value),
187                  PeakShiftParam(PeakShiftParam_Data.second.initial_value),                  PeakShiftParam(PeakShiftParam_Data.second.initial_value),
188                  WlengthX(WlengthX_Data.second.initial_value),                  WlengthX(WlengthX_Data.second.initial_value),
# Line 388  void ControlParam::setData(const RWParam Line 389  void ControlParam::setData(const RWParam
389                  tray.push_back( RWParam_void(NumRefFigureOfMerit_Data, &NumRefFigureOfMerit) );                  tray.push_back( RWParam_void(NumRefFigureOfMerit_Data, &NumRefFigureOfMerit) );
390    
391                  tray.push_back( RWParam_void(SearchLevel_Data, &SearchLevel) );                  tray.push_back( RWParam_void(SearchLevel_Data, &SearchLevel) );
392                  tray.push_back( RWParam_void(NumCores_Data, &NumCores) );  
393                  tray.push_back( RWParam_void(MonoBaseAxis_Data, &MonoBaseAxis) );                  if( ReadConfigurationParameters )
394                  tray.push_back( RWParam_void(RhomAxis_Data, &RhomAxis) );                  {
395                  tray.push_back( RWParam_void(ThresholdNormM_Data, &ThresholdNormM) );                          tray.push_back( RWParam_void(NumCores_Data, &NumCores) );
396                  tray.push_back( RWParam_void(ThresholdRevM_Data, &ThresholdRevM) );                          tray.push_back( RWParam_void(MonoBaseAxis_Data, &MonoBaseAxis) );
397                  tray.push_back( RWParam_void(MinLatticePointDistance_Data, &MinLatticePointDistance) );                          tray.push_back( RWParam_void(RhomAxis_Data, &RhomAxis) );
398                            tray.push_back( RWParam_void(ThresholdNormM_Data, &ThresholdNormM) );
399                            tray.push_back( RWParam_void(ThresholdRevM_Data, &ThresholdRevM) );
400                            tray.push_back( RWParam_void(MinLatticePointDistance_Data, &MinLatticePointDistance) );
401                    }
402          }          }
403  }  }
404    
# Line 551  ZLOG_INFO( "<" + putMaxUnitCellVolumeLab Line 556  ZLOG_INFO( "<" + putMaxUnitCellVolumeLab
556    
557          if( str_MaxNumPeakInRange == "AUTO" )          if( str_MaxNumPeakInRange == "AUTO" )
558          {          {
559                  MaxNumPeakInRange = ifloor( pow(this->putNumberOfReflectionsForFigureOfMerit(), 1.6) );                  MaxNumPeakInRange = ifloor( pow(this->putNumberOfReflectionsForFigureOfMerit(), 1.62) );
560  ZLOG_INFO( "<" + str_MaxNumPeakInRange_Data.first.putLabel() + "> is set to " + num2str(MaxNumPeakInRange) + ".\n" );  ZLOG_INFO( "<" + str_MaxNumPeakInRange_Data.first.putLabel() + "> is set to " + num2str(MaxNumPeakInRange) + ".\n" );
561          }          }
562    
Legend:
Removed from v.9  
changed lines
  Added in v.16
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help