If you are using GitLab outside of the ILL, then you will need to use HTTPS and not SSH for clone/push/pull operations. If you are using the VPN, then SSH will work normally.

Commit ef722226 authored by legoc's avatar legoc

Removed ParameterizableScan1D related classes

parent 988d9fc8
/*
* Nomad Instrument Control Software
*
* Copyright 2011 Institut Laue-Langevin
*
* Licensed under the EUPL, Version 1.1 only (the "License");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* http://joinup.ec.europa.eu/software/page/eupl
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*/
package fr.ill.ics.bridge.scan;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import fr.ill.ics.core.property.Property;
public interface IParameterizableScan1D {
public final static String NO_OPTIMIZATION = "none";
public final static String MULTI_GAUSSIAN_FIT = "multi gaussian fit";
public final static String POLYNOMIAL_FIT = "polynomial fit";
public final static String CENTER_OF_MASS = "center of mass";
public final static String GAUSSIAN_FIT = "gaussian fit";
public final static String BEST_FIT = "best fit";
public final static String NO_ACTION = "none";
public final static String GOTO_ACTION = "goto";
public final static String OFFSET_ACTION = "offset";
/**
* Class to pass data from Nomad to the bridge.
* Same content than ParameterizableScan1DLine in Nomad project
* @author legoc
*
*/
public static class Variable {
public final static int MODE_INTERVAL = 0;
public final static int MODE_DELTA = 1;
public final static int MODE_FLIP = 2;
public final static int MODE_EXPLICIT_VALUES = 3;
public final static int MODE_DELTA_INTERVAL = 4;
public int modeType = MODE_INTERVAL;
public final static int DELTA_MIN = 0;
public final static int DELTA_MAX = 1;
public final static int DELTA_CENTER = 2;
public int deltaType = DELTA_MIN;
public String controllerName;
public String wantedPropertyName;
public String value1 = "0";
public String value2 = "0";
public String value3 = "0";
public double currentValue;
public String values = "";
public String toString() {
return "Variable controller = " + controllerName + ", property = " + wantedPropertyName + ", mode = " + modeType + ", delta = " + deltaType + ", value1 = " + value1 + ", value2 = " + value2 + ", nb steps = " + value3 + ", current = " + currentValue + ", values = " + values;
}
};
public static class ActualProperties {
public LinkedList<Property> steps = new LinkedList<Property>();
public LinkedList<Property> values = new LinkedList<Property>();
}
public static class OptimizationParameters {
public String optimizationType;
public String fitOrder;
public String actionType;
public String toString() {
return "Optimization parameters type = " + optimizationType + ", fit order = " + fitOrder + ", action = " + actionType;
}
}
public ActualProperties getServerVariables(Map<String, Property> properties, Map<String, Property> realDynamicProperties, List<Variable> variables, OptimizationParameters optimizationParameters, boolean isInForLoop);
public ActualProperties setServerVariables(Map<String, Property> properties, Map<String, Property> realDynamicProperties, List<Variable> variables, OptimizationParameters optimizationParameters, boolean isInForLoop);
public void setOptimization(Map<String, Property> map, String value);
public void setAction(Map<String, Property> properties, String value);
public void setFitOrder(Map<String, Property> properties, String value);
public void setMoment(Map<String, Property> properties, String value);
public String getOptimization(Map<String, Property> properties);
public String getAction(Map<String, Property> properties);
public String getFitOrder(Map<String, Property> properties);
public String getMoment(Map<String, Property> properties);
public void loadVariable(String role, String propertyName, String value, List<Variable> variables, OptimizationParameters optimizationParameters);
public void setRole(String newRole);
}
\ No newline at end of file
......@@ -56,7 +56,6 @@ import fr.ill.ics.nscclient.servant.ResourceNotFoundException;
import fr.ill.ics.nscclient.servant.Servant;
import fr.ill.ics.nscclient.servant.SpyPropertyDescriptor;
import fr.ill.ics.nscclient.servant.StandardPropertyDescriptor;
import fr.ill.ics.nscclient.servant.scan.IcsParameterizableScan1D;
import fr.ill.ics.nscclient.serverconnection.ServerInstance;
public class ServantManagerAccessor {
......@@ -531,13 +530,8 @@ public class ServantManagerAccessor {
private ControllerServant createController(ClientServantDescriptor descriptor) {
ControllerServant controller = null;
ControllerServant controller = new ControllerServant(DATABASE_ID, descriptor.getId(), descriptor);
if (descriptor.getType().contains(PARAMETERIZABLE_SCAN_1D)) {
controller = new IcsParameterizableScan1D(DATABASE_ID, descriptor.getId(), descriptor);
} else {
controller = new ControllerServant(DATABASE_ID, descriptor.getId(), descriptor);
}
// no initialisation here
servants.put(descriptor.getId(), controller);
return controller;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment