diff --git a/JAVA/MAC/jRSP/src/nl/astron/lofar/java/mac/jrsp/tools/Attic/CodeGenerator.java b/JAVA/MAC/jRSP/src/nl/astron/lofar/java/mac/jrsp/tools/Attic/CodeGenerator.java
deleted file mode 100644
index b33bf32d4bdaf710e763b2e3eca7201871c56e84..0000000000000000000000000000000000000000
--- a/JAVA/MAC/jRSP/src/nl/astron/lofar/java/mac/jrsp/tools/Attic/CodeGenerator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package nl.astron.lofar.mac.apl.gui.jrsp.tools;
-
-/**
- * This class is just a quick and dirty way of making the jni code.
- */
-import java.util.ArrayList;
-
-public class CodeGenerator
-{
- public static void main(String args[])
- {
- ArrayList<String> al = new ArrayList<String>();
-
- al.add("voltage1V2");
- al.add("voltage2V5");
- al.add("voltage3V3");
- al.add("pcbTemp");
- al.add("bpTemp");
- al.add("ap0Temp");
- al.add("ap1Temp");
- al.add("ap2Temp");
- al.add("ap3Temp");
- al.add("bpClock");
- al.add("nofFrames");
- al.add("nofErrors");
- al.add("lastError");
- al.add("seqNr");
- al.add("error");
- al.add("ifUnderTest");
- al.add("mode");
- al.add("riErrors");
- al.add("rcuxErrors");
- al.add("lcuErrors");
- al.add("cepErrors");
- al.add("serdesErrors");
- al.add("ap0RiErrors");
- al.add("ap1RiErrors");
- al.add("ap2RiErrors");
- al.add("ap3RiErrors");
- al.add("blp0Sync");
- al.add("blp1Sync");
- al.add("blp2Sync");
- al.add("blp3Sync");
- al.add("blp0Rcu");
- al.add("blp1Rcu");
- al.add("blp2Rcu");
- al.add("blp3Rcu");
- al.add("cpStatus");
- al.add("blp0AdcOffset");
- al.add("blp1AdcOffset");
- al.add("blp2AdcOffset");
- al.add("blp3AdcOffset");
-
- System.out.println("-- GETTING THE FIELD ID --");
- for(int i = 0; i<al.size(); i++)
- {
- char[] fid = al.get(i).toCharArray();
- fid[0] = java.lang.Character.toUpperCase(fid[0]);
- String sFid = "fid"+new String(fid);
-
- System.out.println("\tjfieldID " + sFid + " = env->GetFieldID(clsStatus, \"" + al.get(i) + "\", \"I\");");
- al.set(i, sFid);
- }
-
- System.out.println("\n\n");
- for(int i = 0; i<al.size(); i++)
- {
- System.out.println("\tif("+al.get(i)+" != 0)\n\t{\n\t\tenv->SetIntField(status, "+al.get(i)+", testData);\n\t}");
- }
- }
-}
diff --git a/JAVA/MAC/jRSP/src/nl/astron/lofar/java/mac/jrsp/tools/Attic/SubbandStatsTest.java b/JAVA/MAC/jRSP/src/nl/astron/lofar/java/mac/jrsp/tools/Attic/SubbandStatsTest.java
deleted file mode 100644
index da61847f6d141ad95d7c23ab000df5a60a12931c..0000000000000000000000000000000000000000
--- a/JAVA/MAC/jRSP/src/nl/astron/lofar/java/mac/jrsp/tools/Attic/SubbandStatsTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package nl.astron.lofar.mac.apl.gui.jrsp.tools;
-
-import nl.astron.lofar.mac.apl.gui.jrsp.Board;
-
-public class SubbandStatsTest
-{
- public static void main(String[] args)
- {
- double subbandStats[] = null;
-
- Board b = new Board();
- try {
- b.connect("localhost");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- if(b.isConnected())
- {
-
- }
- b.disconnect();
-
- /* if(subbandStats != null)
- {
- for(int i=0; i<subbandStats.length; i++)
- {
- System.out.println(i + ": " + subbandStats[i]);
- }
- }*/
- }
-}
\ No newline at end of file
diff --git a/JAVA/MAC/jRSP/src/nl/astron/lofar/java/mac/jrsp/tools/Attic/TestClass.java b/JAVA/MAC/jRSP/src/nl/astron/lofar/java/mac/jrsp/tools/Attic/TestClass.java
deleted file mode 100644
index d7e691682dd2b84a4068f70099bea69e1b135728..0000000000000000000000000000000000000000
--- a/JAVA/MAC/jRSP/src/nl/astron/lofar/java/mac/jrsp/tools/Attic/TestClass.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package nl.astron.lofar.mac.apl.gui.jrsp.tools;
-import nl.astron.lofar.mac.apl.gui.jrsp.Board;
-import nl.astron.lofar.mac.apl.gui.jrsp.RCUMask;
-
-public class TestClass
-{
- public static void main(String[] args) throws Exception
- {
- System.out.println(">>--> TEST CLASS <--<<");
-
- Board b = new Board();
- b.connect("rs002");
-
- if (b.isConnected())
- {
- double[] dd = b.getSubbandStats(new RCUMask(1));//b.getBeamletStats(new RSPMask(1));
- System.out.println("DD LENGTH: " + dd.length);
-
- for (int i = 0; i < dd.length; i++) {
- System.out.println(dd[i]);
- }
- }
-
- b.disconnect();
- }
-
- public static void doSomething() {
-
- Board b = new Board();
-
- System.out.println(b.isConnected());
-
- if (b.isConnected())
- {
-
-
-
- b.disconnect();
- }
- }
-
-
-}
diff --git a/MAC/APL/GUI/jRSP/src/nl/astron/lofar/mac/apl/gui/jrsp/tools/CodeGenerator.java b/MAC/APL/GUI/jRSP/src/nl/astron/lofar/mac/apl/gui/jrsp/tools/CodeGenerator.java
deleted file mode 100644
index b33bf32d4bdaf710e763b2e3eca7201871c56e84..0000000000000000000000000000000000000000
--- a/MAC/APL/GUI/jRSP/src/nl/astron/lofar/mac/apl/gui/jrsp/tools/CodeGenerator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package nl.astron.lofar.mac.apl.gui.jrsp.tools;
-
-/**
- * This class is just a quick and dirty way of making the jni code.
- */
-import java.util.ArrayList;
-
-public class CodeGenerator
-{
- public static void main(String args[])
- {
- ArrayList<String> al = new ArrayList<String>();
-
- al.add("voltage1V2");
- al.add("voltage2V5");
- al.add("voltage3V3");
- al.add("pcbTemp");
- al.add("bpTemp");
- al.add("ap0Temp");
- al.add("ap1Temp");
- al.add("ap2Temp");
- al.add("ap3Temp");
- al.add("bpClock");
- al.add("nofFrames");
- al.add("nofErrors");
- al.add("lastError");
- al.add("seqNr");
- al.add("error");
- al.add("ifUnderTest");
- al.add("mode");
- al.add("riErrors");
- al.add("rcuxErrors");
- al.add("lcuErrors");
- al.add("cepErrors");
- al.add("serdesErrors");
- al.add("ap0RiErrors");
- al.add("ap1RiErrors");
- al.add("ap2RiErrors");
- al.add("ap3RiErrors");
- al.add("blp0Sync");
- al.add("blp1Sync");
- al.add("blp2Sync");
- al.add("blp3Sync");
- al.add("blp0Rcu");
- al.add("blp1Rcu");
- al.add("blp2Rcu");
- al.add("blp3Rcu");
- al.add("cpStatus");
- al.add("blp0AdcOffset");
- al.add("blp1AdcOffset");
- al.add("blp2AdcOffset");
- al.add("blp3AdcOffset");
-
- System.out.println("-- GETTING THE FIELD ID --");
- for(int i = 0; i<al.size(); i++)
- {
- char[] fid = al.get(i).toCharArray();
- fid[0] = java.lang.Character.toUpperCase(fid[0]);
- String sFid = "fid"+new String(fid);
-
- System.out.println("\tjfieldID " + sFid + " = env->GetFieldID(clsStatus, \"" + al.get(i) + "\", \"I\");");
- al.set(i, sFid);
- }
-
- System.out.println("\n\n");
- for(int i = 0; i<al.size(); i++)
- {
- System.out.println("\tif("+al.get(i)+" != 0)\n\t{\n\t\tenv->SetIntField(status, "+al.get(i)+", testData);\n\t}");
- }
- }
-}
diff --git a/MAC/APL/GUI/jRSP/src/nl/astron/lofar/mac/apl/gui/jrsp/tools/SubbandStatsTest.java b/MAC/APL/GUI/jRSP/src/nl/astron/lofar/mac/apl/gui/jrsp/tools/SubbandStatsTest.java
deleted file mode 100644
index da61847f6d141ad95d7c23ab000df5a60a12931c..0000000000000000000000000000000000000000
--- a/MAC/APL/GUI/jRSP/src/nl/astron/lofar/mac/apl/gui/jrsp/tools/SubbandStatsTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package nl.astron.lofar.mac.apl.gui.jrsp.tools;
-
-import nl.astron.lofar.mac.apl.gui.jrsp.Board;
-
-public class SubbandStatsTest
-{
- public static void main(String[] args)
- {
- double subbandStats[] = null;
-
- Board b = new Board();
- try {
- b.connect("localhost");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- if(b.isConnected())
- {
-
- }
- b.disconnect();
-
- /* if(subbandStats != null)
- {
- for(int i=0; i<subbandStats.length; i++)
- {
- System.out.println(i + ": " + subbandStats[i]);
- }
- }*/
- }
-}
\ No newline at end of file
diff --git a/MAC/APL/GUI/jRSP/src/nl/astron/lofar/mac/apl/gui/jrsp/tools/TestClass.java b/MAC/APL/GUI/jRSP/src/nl/astron/lofar/mac/apl/gui/jrsp/tools/TestClass.java
deleted file mode 100644
index d7e691682dd2b84a4068f70099bea69e1b135728..0000000000000000000000000000000000000000
--- a/MAC/APL/GUI/jRSP/src/nl/astron/lofar/mac/apl/gui/jrsp/tools/TestClass.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package nl.astron.lofar.mac.apl.gui.jrsp.tools;
-import nl.astron.lofar.mac.apl.gui.jrsp.Board;
-import nl.astron.lofar.mac.apl.gui.jrsp.RCUMask;
-
-public class TestClass
-{
- public static void main(String[] args) throws Exception
- {
- System.out.println(">>--> TEST CLASS <--<<");
-
- Board b = new Board();
- b.connect("rs002");
-
- if (b.isConnected())
- {
- double[] dd = b.getSubbandStats(new RCUMask(1));//b.getBeamletStats(new RSPMask(1));
- System.out.println("DD LENGTH: " + dd.length);
-
- for (int i = 0; i < dd.length; i++) {
- System.out.println(dd[i]);
- }
- }
-
- b.disconnect();
- }
-
- public static void doSomething() {
-
- Board b = new Board();
-
- System.out.println(b.isConnected());
-
- if (b.isConnected())
- {
-
-
-
- b.disconnect();
- }
- }
-
-
-}