Cleanup network paths (#974)

* rename, remove another network

* use new network location

* new network location

* update to latest networks

* bugfix, new path

Author: baltzell

.gitmodules

@@ -5,5 +5,5 @@
 	path = validation/advanced-tests/data
 	url = https://code.jlab.org/hallb/clas12/coatjava/advanced-tests
 [submodule "etc/nnet"]
-	path = etc/nnet
+	path = etc/data/nnet
 	url = https://code.jlab.org/hallb/clas12/coatjava/networks

build-coatjava.sh

@@ -110,7 +110,7 @@ download () {
           cd $src_dir > /dev/null
           git lfs install
           git submodule update --init etc/data/magfield
-          git submodule update --init etc/nnet
+          git submodule update --init etc/data/nnet
           if $downloadData; then git submodule update --init validation/advanced-tests/data; fi
           cd - > /dev/null
         else

etc/data/nnet

@@ -65,7 +65,7 @@ public boolean init() {
         try {
             criteria = Criteria.builder()
                 .setTypes(float[][].class, float[][].class)
-                .optModelPath(Paths.get(ClasUtilsFile.getResourceDir("CLAS12DIR","etc/nnet/dn/cnn_autoenc_sector1_nBlocks2.pt")))
+                .optModelPath(Paths.get(ClasUtilsFile.getResourceDir("CLAS12DIR","etc/data/nnet/dn/cnn_autoenc_sector1_nBlocks2.pt")))
                 .optEngine("PyTorch")
                 .optTranslator(DCDenoiseEngine.getTranslator())
                 .optProgress(new ProgressBar())

etc/ejml/ejmlclas12.network

@@ -43,7 +43,7 @@ public NDList processInput(TranslatorContext translatorContext, float[] floats)
         System.setProperty("ai.djl.pytorch.num_threads", "1");
         System.setProperty("ai.djl.pytorch.graph_optimizer", "false");
 
-        String path = CLASResources.getResourcePath("etc/nnet/ALERT/model_AHDC/");
+        String path = CLASResources.getResourcePath("etc/data/nnet/ALERT/model_AHDC/");
         Criteria<float[], Float> my_model = Criteria.builder().setTypes(float[].class, Float.class)
                 .optModelPath(Paths.get(path))
                 .optEngine("PyTorch")

etc/nnet

@@ -45,7 +45,7 @@ public boolean init() {
         String runNumber = Optional.ofNullable(this.getEngineConfigString("run")).orElse("5038");
         networkRun = Integer.parseInt(runNumber);
 
-        String path = CLASResources.getResourcePath("etc/ejml/ejmlclas12.network"); 
+        String path = CLASResources.getResourcePath("etc/data/nnet/ejml/ejmlclas12.network"); 
         if(this.getEngineConfigString("network")!=null) 
             path = this.getEngineConfigString("network");
         System.out.println("[neural-network] info : Loading neural network from " + path);

reconstruction/ai/src/main/java/org/jlab/service/ai/DCDenoiseEngine.java

@@ -29,7 +29,7 @@ public MLTNEngine(){
     @Override
     public boolean init() {
         classifier.setEnvDirectory("CLAS12DIR");
-        classifier.setEnvPath("etc/nnet/neuroph");
+        classifier.setEnvPath("etc/data/nnet/neuroph");
         classifier.load("trackClassifier.nnet", "trackFixer.nnet");
         System.out.println("Loading neural network files done...");
         //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.