JHUAPL/JCAT
1
0
Fork 0
mirror of https://github.com/JHUAPL/JCAT.git synced 2026-01-08 23:47:59 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Altered the SW CDR file reader to address bugs with partition vs. SCLK priority.

Browse Source
This commit is contained in:
David C. Stephens
2024-10-31 14:19:40 -05:00
parent 179cba539e
commit ba093b070c
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/reader/SWCDRLibrary.java
View File

@@ -26,8 +26,10 @@ import util.JCATMessageWindow;
public class SWCDRLibrary { public class SWCDRLibrary {
private NavigableMap<Integer, NavigableMap<Integer, String>> swMapS; // private NavigableMap<Integer, NavigableMap<Integer, String>> swMapS;
private NavigableMap<Integer, NavigableMap<Integer, String>> swMapL; // private NavigableMap<Integer, NavigableMap<Integer, String>> swMapL;
private NavigableMap<Integer, String> swMapS;
private NavigableMap<Integer, String> swMapL;
private final String swPath = "/resources/sw"; private final String swPath = "/resources/sw";
@@ -51,21 +53,21 @@ public class SWCDRLibrary {
} }
public LinkedHashMap<Integer, Double> getBandMap(String detector, int partition, double sclk) { public LinkedHashMap<Integer, Double> getBandMap(String detector, int partition, double sclk) {
NavigableMap<Integer, NavigableMap<Integer, String>> swMap = null; NavigableMap<Integer, String> swMap = null;
if (detector.trim().equalsIgnoreCase("s")) if (detector.trim().equalsIgnoreCase("s"))
swMap = swMapS; swMap = swMapS;
else if (detector.trim().equalsIgnoreCase("l")) else if (detector.trim().equalsIgnoreCase("l"))
swMap = swMapL; swMap = swMapL;
Map.Entry<Integer, NavigableMap<Integer, String>> swEntry = swMap.floorEntry(partition); // Map.Entry<Integer, NavigableMap<Integer, String>> swEntry = swMap.floorEntry(partition);
NavigableMap<Integer, String> partitionMap = swEntry.getValue(); // NavigableMap<Integer, String> partitionMap = swEntry.getValue();
if (partitionMap == null) // if (partitionMap == null)
return null; // return null;
Map.Entry<Integer, String> partitionEntry = partitionMap.floorEntry((int) sclk); Map.Entry<Integer, String> swEntry = swMap.floorEntry((int) sclk);
String cdrFile = partitionEntry.getValue(); String cdrFile = swEntry.getValue();
if (cdrFile == null) if (cdrFile == null)
return null; return null;
@@ -112,11 +114,11 @@ public class SWCDRLibrary {
if (path.toString().endsWith("tab")) { if (path.toString().endsWith("tab")) {
String basename = FilenameUtils.getBaseName(path.toString()); String basename = FilenameUtils.getBaseName(path.toString());
String[] parts = basename.split("_"); String[] parts = basename.split("_");
int partition = Integer.parseInt(parts[1]); // int partition = Integer.parseInt(parts[1]); # not needed since sclk does not reset on partition change
int sclk = Integer.parseInt(parts[2]); int sclk = Integer.parseInt(parts[2]);
String detector = parts[4]; String detector = parts[4];
NavigableMap<Integer, NavigableMap<Integer, String>> swMap; NavigableMap<Integer, String> swMap;
if (detector.equalsIgnoreCase("s")) { if (detector.equalsIgnoreCase("s")) {
swMap = swMapS; swMap = swMapS;
} else if (detector.equalsIgnoreCase("l")) { } else if (detector.equalsIgnoreCase("l")) {
@@ -124,13 +126,18 @@ public class SWCDRLibrary {
} else } else
continue; continue;
NavigableMap<Integer, String> partitionMap = swMap.get(partition); // NavigableMap<Integer, String> partitionMap = swMap.get(partition);
if (partitionMap == null) { // if (partitionMap == null) {
partitionMap = new TreeMap<>(); // partitionMap = new TreeMap<>();
swMap.put(partition, partitionMap); // swMap.put(partition, partitionMap);
// }
String swEntry = swMap.get(sclk);
if (swEntry == null){
swMap.put(sclk, path.toString());
} }
partitionMap.put(sclk, path.toString()); // partitionMap.put(sclk, path.toString());
} }
} }
} }