Changes in src/Actions/AnalysisAction/SurfaceCorrelationAction.def [6ba9ba:e4afb4]

File:

• src/Actions/AnalysisAction/SurfaceCorrelationAction.def (modified) (1 diff)

src/Actions/AnalysisAction/SurfaceCorrelationAction.def

@@ -12 +12 @@
 class molecule;
 
-#include "Parameters/Validators/DummyValidator.hpp"
-#include "Parameters/Validators/Ops_Validator.hpp"
-#include "Parameters/Validators/STLVectorValidator.hpp"
-#include "Parameters/Validators/Specific/BoxLengthValidator.hpp"
-#include "Parameters/Validators/Specific/ElementValidator.hpp"
-#include "Parameters/Validators/Specific/FilePresentValidator.hpp"
-
 // i.e. there is an integer with variable name Z that can be found in
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
-// "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
-#define paramtypes (std::vector<const element *>)(double)(double)(double)(boost::filesystem::path)(boost::filesystem::path)(bool)
-#define paramreferences (elements)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
-#define paramtokens ("elements")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
-#define paramdescriptions ("set of elements")("start of the first bin")("width of the bins")("start of the last bin")("name of the output file")("name of the bin output file")("system is constraint to periodic boundary conditions")
-#define paramdefaults (NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(0.5))(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(NOPARAM_DEFAULT)(PARAM_DEFAULT(false))
-#define paramvalids \
-(STLVectorValidator< std::vector<const element *> >(ElementValidator())) \
-(BoxLengthValidator()) \
-(BoxLengthValidator()) \
-(BoxLengthValidator()) \
-(!FilePresentValidator()) \
-(!FilePresentValidator()) \
-(DummyValidator<bool>())
+// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
+#define paramtypes (std::vector<const element *>)(const molecule *)(double)(double)(double)(boost::filesystem::path)(boost::filesystem::path)(bool)
+#define paramreferences (elements)(Boundary)(BinStart)(BinWidth)(BinEnd)(outputname)(binoutputname)(periodic)
+#define paramtokens ("elements")("molecule-by-id")("bin-start")("bin-width")("bin-end")("output-file")("bin-output-file")("periodic")
+#define paramdescriptions ("set of elements")("index of a molecule")("start of the first bin")("width of the bins")("start of the last bin")("name of the output file")("name of the bin output file")("system is constraint to periodic boundary conditions")
+#define paramdefaults (NODEFAULT)(NODEFAULT)(NODEFAULT)("0.5")(NODEFAULT)(NODEFAULT)(NODEFAULT)("0")
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS