Skip to content

Commit

Permalink
Merge pull request #590 from AFM-SPM/SylviaWhittle/589-free-channel
Browse files Browse the repository at this point in the history
Make channel a free text field
  • Loading branch information
SylviaWhittle authored May 30, 2023
2 parents aaeb4fe + 8f7f060 commit f1ebf4a
Showing 1 changed file with 1 addition and 35 deletions.
36 changes: 1 addition & 35 deletions topostats/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,41 +53,7 @@ def validate_config(config: dict, schema: Schema, config_type: str) -> None:
".gwy",
error="Invalid value in config for 'file_ext', valid values are '.spm', '.jpk', '.ibw' or '.asd'.",
),
"loading": {
"channel": Or(
"ZSensor",
"",
"Stiffness",
"LogStiffness",
"Adhesion",
"Deformation",
"Dissipation",
"Height Sensor",
"Height", # end of spm channels
"HeightTracee",
"HeightRetrace",
"ZSensorTrace",
"ZSensorRetrace",
"UserIn0Trace",
"UserIn0Retrace",
"UserIn1Trace",
"UserIn1Retrace", # end of ibw channels
"topography",
"phase", # end of asd channels
"height_retrace",
"measuredHeight_retrace",
"amplitude_retrace",
"phase_retrace",
"error_retrace",
"height_trace",
"measuredHeight_trace",
"amplitude_trace",
"phase_trace",
"error_trace", # end of jpk channels
error="Invalid value in config file for 'channel', all possible"
"image channels are seen in the above error message.",
)
},
"loading": {"channel": str},
"filter": {
"run": Or(
True,
Expand Down

0 comments on commit f1ebf4a

Please sign in to comment.