NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

global cleanup

Browse Source
This commit is contained in:
Alexander Nozik 2016-10-14 23:12:06 +03:00
parent 6181407cd5
commit 7628386d56
11 changed files with 17 additions and 1114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -6,6 +6,7 @@ syntax: glob
*.conflict
build/*
target/*
private/*
.gradle/*
.nb-gradle/*
.idea/

5
numass-control/magnet/src/main/java/inr/numass/control/magnet/SafeMagnetController.java
View File

@ -17,11 +17,12 @@ package inr.numass.control.magnet;
import hep.dataforge.control.ports.PortHandler;
import hep.dataforge.exceptions.PortException;
import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Predicate;
import org.slf4j.LoggerFactory;
/**
*
@ -85,7 +86,7 @@ public class SafeMagnetController extends MagnetController {
super.setCurrent(current);
}
public static interface SafeMagnetCondition {
public interface SafeMagnetCondition {
boolean isSafe(int address, double current);

2
numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspViewController.java
View File

@ -336,7 +336,7 @@ public class MspViewController implements Initializable, MspListener {
}
public void shutdown() throws IOException, PortException, ControlException {
public void shutdown() throws IOException, ControlException {
getDevice().shutdown();
}

2
numass-main/src/main/java/inr/numass/NumassPlugin.java
View File

@ -262,7 +262,7 @@ public class NumassPlugin extends BasicPlugin {
} else if (an.hasMeta("transBuildAction")) {
Meta transBuild = an.getMeta("transBuildAction");
try {
return TransmissionInterpolator.fromAction((Context) context,
return TransmissionInterpolator.fromAction(context,
transBuild, transXName, transYName, nSmooth, w, stitchBorder);
} catch (InterruptedException ex) {
throw new RuntimeException("Transmission build failed");

4
numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java
View File

@ -215,7 +215,7 @@ public class ShowLossSpectrumAction extends OneToOneAction<FitState, FitState> {
writer.println("***SPECTRUM SPREAD***");
writer.println();
ParamSet parameters = input.getParameters().getSubSet(new String[]{"exPos", "ionPos", "exW", "ionW", "exIonRatio"});
ParamSet parameters = input.getParameters().getSubSet("exPos", "ionPos", "exW", "ionW", "exIonRatio");
NamedMatrix covariance = input.getCovariance();
Table spreadData = generateSpread(writer, name, parameters, covariance);
ColumnedDataWriter.writeDataSet(System.out, spreadData, "", spreadData.getFormat().namesAsArray());
@ -246,7 +246,7 @@ public class ShowLossSpectrumAction extends OneToOneAction<FitState, FitState> {
}
public double calultateIonRatioError(String dataNeme, FitState state, double threshold) {
ParamSet parameters = state.getParameters().getSubSet(new String[]{"exPos", "ionPos", "exW", "ionW", "exIonRatio"});
ParamSet parameters = state.getParameters().getSubSet("exPos", "ionPos", "exW", "ionW", "exIonRatio");
NamedMatrix covariance = state.getCovariance();
return calultateIonRatioError(dataNeme, parameters, covariance, threshold);
}

2
numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java
View File

@ -259,7 +259,7 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder
actionsConfig = new Configuration("actionlist");
List<Configuration> actions = config.getMetaList("action").stream()
.<Configuration>map(m -> new Configuration(m)).collect(Collectors.toList());
.map(m -> new Configuration(m)).collect(Collectors.toList());
actionsConfig.attachNodeItem("action", actions);

3
numass-storage/numass-server/src/main/java/inr/numass/server/NumassServerDaemon.java
View File

@ -22,7 +22,6 @@ import hep.dataforge.storage.commons.StorageManager;
import hep.dataforge.storage.filestorage.FileStorage;
import org.apache.commons.daemon.Daemon;
import org.apache.commons.daemon.DaemonContext;
import org.apache.commons.daemon.DaemonInitException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -67,7 +66,7 @@ public class NumassServerDaemon implements Daemon, Annotated {
}
@Override
public void init(DaemonContext dc) throws DaemonInitException, Exception {
public void init(DaemonContext dc) throws Exception {
logger.info("Starting numass server daemon");
logger.info("Starting storage plugin");
new StorageManager().startGlobal();

21
numass-viewer/private/cache/retriever/catalog.xml vendored
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Copyright 2015 Alexander Nozik.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
<system systemId="http://javafx.com/javafx/8.0.40" uri="www.oracle.com/technetwork/java/javase/overview/index.html"/>
<system systemId="http://javafx.com/javafx/8" uri="www.oracle.com/technetwork/java/javase/overview/index.html"/>
</catalog>

1077
numass-viewer/private/cache/retriever/www.oracle.com/technetwork/java/javase/overview/index.html vendored
View File

File diff suppressed because one or more lines are too long

12
numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java
View File

@ -225,16 +225,16 @@ public class NumassLoaderTreeBuilder {
public interface TreeItemValue {
public String getName();
String getName();
public String getTime();
String getTime();
public String getDescription();
String getDescription();
public NumassData getLoader();
NumassData getLoader();
public NumassStorage getStorage();
NumassStorage getStorage();
public boolean isLoader();
boolean isLoader();
}
}

2
numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderViewComponent.java
View File

@ -297,7 +297,7 @@ public class NumassLoaderViewComponent extends AnchorPane implements Initializab
spectrumData.clear();
} else {
spectrumData.fillData(points.stream()
.<DataPoint>map((NMPoint point) -> getSpectrumPoint(point, lowChannel, highChannel, getDTime()))
.map((NMPoint point) -> getSpectrumPoint(point, lowChannel, highChannel, getDTime()))
.collect(Collectors.toList()));
}
}