diff --git a/numass-control/cryotemp/src/main/java/inr/numass/control/cryotemp/PKT8Device.java b/numass-control/cryotemp/src/main/java/inr/numass/control/cryotemp/PKT8Device.java index 18d222c9..40b5ab91 100644 --- a/numass-control/cryotemp/src/main/java/inr/numass/control/cryotemp/PKT8Device.java +++ b/numass-control/cryotemp/src/main/java/inr/numass/control/cryotemp/PKT8Device.java @@ -93,7 +93,7 @@ public class PKT8Device extends PortSensor { return LoaderFactory.buildPointLoder(storage, "cryotemp_" + suffix, "", "timestamp", getTableFormat()); } catch (StorageException e) { - throw new RuntimeException("Failed to build loader from storage", e); + throw new RuntimeException("Failed to builder loader from storage", e); } } diff --git a/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java b/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java index 07727131..95ff3564 100644 --- a/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java +++ b/numass-control/msp/src/main/java/inr/numass/control/msp/MspDevice.java @@ -231,7 +231,7 @@ public class MspDevice extends Sensor implements PortHandler.PortControl } /** - * A helper method to build msp command string + * A helper method to builder msp command string * * @param command * @param parameters diff --git a/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java b/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java index 2e731df8..60d0aad8 100644 --- a/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java +++ b/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java @@ -209,7 +209,7 @@ public class NumassDataUtils { // double corrFactor = 1 + beta; // res.row(reader.buildSpectrumDataPoint(reader.getX(dp).doubleValue() * corrFactor, reader.getCount(dp), reader.getTime(dp))); // } -// return res.build(); +// return res.builder(); // } // public static SpectrumDataAdapter adapter() { @@ -234,7 +234,7 @@ public class NumassDataUtils { // double corrFactor = 1 / (1 - dtime * adapter.getCount(dp) / adapter.getTime(dp)); // res.row(adapter.buildSpectrumDataPoint(adapter.getX(dp).doubleValue(), (long) (adapter.getCount(dp) * corrFactor), adapter.getTime(dp))); // } -// return res.build(); +// return res.builder(); // } // // public static double countRateWithDeadTime(NumassPoint p, int from, int to, double deadTime) { diff --git a/numass-core/src/main/java/inr/numass/data/storage/NumassStorage.java b/numass-core/src/main/java/inr/numass/data/storage/NumassStorage.java index 434f504b..3679651e 100644 --- a/numass-core/src/main/java/inr/numass/data/storage/NumassStorage.java +++ b/numass-core/src/main/java/inr/numass/data/storage/NumassStorage.java @@ -84,7 +84,7 @@ public class NumassStorage extends FileStorage { // loaders.put(getFileName(file), // FilePointLoader.fromFile(this, file, true)); // } catch (Exception ex) { -// getLogger().error("Failed to build numass point loader from file {}", file.getName()); +// getLogger().error("Failed to builder numass point loader from file {}", file.getName()); // } } else { //updating non-numass loader files diff --git a/numass-main/src/main/java/inr/numass/NumassPlugin.java b/numass-main/src/main/java/inr/numass/NumassPlugin.java index 15633221..1866fcc5 100644 --- a/numass-main/src/main/java/inr/numass/NumassPlugin.java +++ b/numass-main/src/main/java/inr/numass/NumassPlugin.java @@ -185,7 +185,7 @@ public class NumassPlugin extends BasicPlugin { manager.addModel("scatter-empiric-variable", (context, an) -> { double eGun = an.getDouble("eGun", 19005d); - //build transmisssion with given data, annotation and smoothing + //builder transmisssion with given data, annotation and smoothing UnivariateFunction interpolator = buildInterpolator(context, an, eGun); VariableLossSpectrum loss = VariableLossSpectrum.withData(interpolator, eGun + 5); @@ -226,7 +226,7 @@ public class NumassPlugin extends BasicPlugin { manager.addModel("scatter-empiric-experimental", (context, an) -> { double eGun = an.getDouble("eGun", 19005d); - //build transmisssion with given data, annotation and smoothing + //builder transmisssion with given data, annotation and smoothing UnivariateFunction interpolator = buildInterpolator(context, an, eGun); double smoothing = an.getDouble("lossSmoothing", 0.3); @@ -287,7 +287,7 @@ public class NumassPlugin extends BasicPlugin { return TransmissionInterpolator.fromAction(context, transBuild, transXName, transYName, nSmooth, w, stitchBorder); } catch (InterruptedException ex) { - throw new RuntimeException("Transmission build failed"); + throw new RuntimeException("Transmission builder failed"); } } else { throw new RuntimeException("Transmission declaration not found"); diff --git a/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java b/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java index 07c33f04..805a47ce 100644 --- a/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java +++ b/numass-main/src/main/java/inr/numass/tasks/NumassPrepareTask.java @@ -49,7 +49,7 @@ public class NumassPrepareTask extends AbstractTask { // Meta dataMeta = config.getMeta("data"); // URI storageUri = input.getCheckedData("dataRoot", URI.class).get(); // DataSet.Builder dataBuilder = readData(getWork(model, input.getName()), context, storageUri, dataMeta); -// DataNode data = dataBuilder.build(); +// DataNode data = dataBuilder.builder(); //preparing table data Meta prepareMeta = config.getMeta("prepare"); @@ -192,6 +192,6 @@ public class NumassPrepareTask extends AbstractTask
{ // .addNode("prepare", PrepareDataAction.class) // .addNode("monitor", MonitorCorrectAction.class) // .addNode("merge", MergeDataAction.class) -// .build(); +// .builder(); // } } diff --git a/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java b/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java index 4de111a8..322ed4bd 100644 --- a/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java +++ b/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java @@ -70,7 +70,7 @@ public class UnderflowCorrection { // double[] fitRes = getUnderflowExpParameters(point, xLow, xHigh, binning); // builder.row(point.getVoltage(), fitRes[0], fitRes[1]); // } -// return builder.build(); +// return builder.builder(); // } public Values fitPoint(NumassPoint point, int xLow, int xHigh, int upper, int binning) { diff --git a/numass-server/src/main/java/inr/numass/server/NumassServer.java b/numass-server/src/main/java/inr/numass/server/NumassServer.java index 8b961ce7..b1c35d1c 100644 --- a/numass-server/src/main/java/inr/numass/server/NumassServer.java +++ b/numass-server/src/main/java/inr/numass/server/NumassServer.java @@ -206,7 +206,7 @@ public class NumassServer extends AbstractNetworkListener implements Encapsulate // .putMetaNode(new AnnotationBuilder("error") // .putValue("type", "auth") // .putValue("message", "Authorisation faild. Need the role '"+requiredRole+"'") -// .build() +// .builder() // ); // } @Override diff --git a/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt b/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt index b069a06b..6255e5f1 100644 --- a/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt +++ b/numass-viewer/src/main/kotlin/inr/numass/viewer/MainView.kt @@ -56,7 +56,7 @@ class MainView : View("Numass data viewer") { } } -// private val processFragment = FragmentWindow.build(processManagerButton) { +// private val processFragment = FragmentWindow.builder(processManagerButton) { // WorkManagerFragment(getWorkManager()) // }