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 3 by rtomiyasu, Fri Feb 22 04:51:31 2013 UTC revision 6 by rtomiyasu, Wed Feb 27 00:58:34 2013 UTC
# Line 155  const pair<RWParamProperty, RWParamData< Line 155  const pair<RWParamProperty, RWParamData<
155                  RWParamProperty(INT4VALUE, "SearchLevel"),                  RWParamProperty(INT4VALUE, "SearchLevel"),
156                  RWParamData<Int4>((Int4)ConographQuickSearch, REPLACE_NONE<Int4>, GE<Int4>, (Int4)ConographQuickSearch, LE<Int4>, (Int4)ConographRegularSearch, -1, -1) );                  RWParamData<Int4>((Int4)ConographQuickSearch, REPLACE_NONE<Int4>, GE<Int4>, (Int4)ConographQuickSearch, LE<Int4>, (Int4)ConographRegularSearch, -1, -1) );
157    
 #ifdef _OPENMP  
 const pair<RWParamProperty, RWParamData<Int4> > ControlParam::NumCores_Data(  
                 RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),  
                 RWParamData<Int4>(omp_get_max_threads()-1, REPLACE_MAX_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) );  
 #else  
 const pair<RWParamProperty, RWParamData<Int4> > ControlParam::NumCores_Data(  
                 RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),  
                 RWParamData<Int4>(1, REPLACE_MAX_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) );  
 #endif  
   
158  const pair<RWParamProperty, RWParamData<string> > ControlParam::MonoBaseAxis_Data(  const pair<RWParamProperty, RWParamData<string> > ControlParam::MonoBaseAxis_Data(
159                  RWParamProperty(STRVALUE, "AxisForBaseCenteredSymmetry"),                  RWParamProperty(STRVALUE, "AxisForBaseCenteredSymmetry"),
160                  RWParamData<string>("B", REPLACE_NONE<string>, NULL, "", NULL, "", -1, -1) );                  RWParamData<string>("B", REPLACE_NONE<string>, NULL, "", NULL, "", -1, -1) );
# Line 183  const pair<RWParamProperty, RWParamData< Line 173  const pair<RWParamProperty, RWParamData<
173    
174    
175  ControlParam::ControlParam()  ControlParam::ControlParam()
176          : IsADorTOF(IsAngleDispersion_Data.second.initial_value),          :
177    #ifdef _OPENMP
178                    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) ),
180    #else
181                    NumCores_Data(RWParamProperty(INT4VALUE, "NumberOfThreadsToUse"),
182                    RWParamData<Int4>(1, REPLACE_MAX_THREAD, GE<Int4>, 1, NULL, MAX_INT(), -1, -1) ),
183    #endif
184                IsADorTOF(IsAngleDispersion_Data.second.initial_value),
185                  ConvParam(ConvParam_Data.second.initial_value),                  ConvParam(ConvParam_Data.second.initial_value),
186                  PeakShiftParam(PeakShiftParam_Data.second.initial_value),                  PeakShiftParam(PeakShiftParam_Data.second.initial_value),
187                  WlengthX(WlengthX_Data.second.initial_value),                  WlengthX(WlengthX_Data.second.initial_value),
Legend:
Removed from v.3  
changed lines
  Added in v.6
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help