Merge pull request #40 from bowring/dibbsdata

Advances to U-series legacy data processing and Laserchron ElementII live acquisition.
CIRDLES · Dec 9, 2015 · c934e81 · c934e81
2 parents 8b9ecdd + ddfb3e3
commit c934e81
Show file tree

Hide file tree

Showing 149 changed files with 3,368 additions and 1,779 deletions.
diff --git a/README.md b/README.md
@@ -11,9 +11,7 @@ lab at the College of Charleston in Charleston, South Carolina. **ET_Redux** was
 previously known as U-Pb_Redux, but in January of 2015, was renamed to
 reflect its expanding functionality and its sponsor, EARTHTIME (EARTH-TIME.org).
 
-**ET_Redux** currently serves the ID-TIMS and LAICP-MS U-Pb geochronology communities
-as described [here](http://cirdles.org/sites/default/files/Downloads/ggge1933.pdf) and 
-[here](http://cirdles.org/sites/default/files/Downloads/ggge1932.pdf).
+**ET_Redux** currently serves the ID-TIMS and LAICP-MS U-Pb geochronology communities.
 
 We have recently received NSF funding to extend the architecture to Uranium series
 analyses, as explained 

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.cirdles</groupId>
     <artifactId>ET_Redux</artifactId>
     <name>ET_Redux</name>
-    <version>3.3.2</version>
+    <version>3.3.3</version>
     <description>Successor to U-Pb_Redux</description>
     <url>https://cirdles.org</url>
     <inceptionYear>2006</inceptionYear>
@@ -211,7 +211,7 @@
         <dependency>
             <groupId>com.github.cirdles.topsoil</groupId>
             <artifactId>core</artifactId>
-            <version>a416fb4</version>
+            <version>-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.python</groupId>
@@ -221,12 +221,12 @@
         <dependency>
             <groupId>com.github.cirdles</groupId>
             <artifactId>Commons</artifactId>
-            <version>0f628cc</version>
+            <version>-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.github.bowring</groupId>
             <artifactId>SHRIMP</artifactId>
-            <version>2df21f5</version>
+            <version>-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/src/main/java/org/earthtime/ETReduxFrame.java b/src/main/java/org/earthtime/ETReduxFrame.java
@@ -64,11 +64,6 @@
 import org.earthtime.UPb_Redux.dateInterpretation.concordia.AliquotDetailsDisplayInterface;
 import org.earthtime.UPb_Redux.dateInterpretation.concordia.ConcordiaGraphPanel;
 import org.earthtime.UPb_Redux.dateInterpretation.concordia.PlottingDetailsDisplayInterface;
-import org.earthtime.UPb_Redux.dialogs.AboutBox;
-import org.earthtime.UPb_Redux.dialogs.DialogEditor;
-import org.earthtime.UPb_Redux.dialogs.LabDataEditorDialog;
-import org.earthtime.UPb_Redux.dialogs.PreferencesEditorDialog;
-import org.earthtime.UPb_Redux.dialogs.ReportSettingsManager;
 import org.earthtime.UPb_Redux.dialogs.aliquotManagers.AliquotEditorDialog;
 import org.earthtime.UPb_Redux.dialogs.aliquotManagers.AliquotEditorForLAICPMS;
 import org.earthtime.UPb_Redux.dialogs.aliquotManagers.AliquotLegacyEditorForIDTIMS;
@@ -103,7 +98,6 @@
 import org.earthtime.UPb_Redux.fractions.UPbReduxFractions.UPbLAICPMSFraction;
 import org.earthtime.UPb_Redux.fractions.UPbReduxFractions.fractionReduction.PbcCorrectionDetails;
 import org.earthtime.UPb_Redux.fractions.UPbReduxFractions.fractionReduction.UPbFractionReducer;
-import org.earthtime.UPb_Redux.reduxLabData.ReduxLabData;
 import org.earthtime.UPb_Redux.reports.ReportSettings;
 import org.earthtime.UPb_Redux.reports.excelReports.CsvResultsTable;
 import org.earthtime.UPb_Redux.reports.excelReports.ExcelResultsTable;
@@ -127,6 +121,11 @@
 import org.earthtime.dataDictionaries.AnalysisMeasures;
 import org.earthtime.dataDictionaries.SampleAnalysisTypesEnum;
 import org.earthtime.dataDictionaries.SampleTypesEnum;
+import org.earthtime.dialogs.AboutBox;
+import org.earthtime.dialogs.DialogEditor;
+import org.earthtime.dialogs.LabDataEditorDialog;
+import org.earthtime.dialogs.PreferencesEditorDialog;
+import org.earthtime.dialogs.ReportSettingsManager;
 import org.earthtime.dialogs.projectManagers.projectLegacyManagers.AbstractProjectOfLegacySamplesDataManagerDialog;
 import org.earthtime.dialogs.projectManagers.projectLegacyManagers.ProjectOfLegacySamplesDataManagerDialogForDIBBsUseries_A;
 import org.earthtime.dialogs.projectManagers.projectLegacyManagers.ProjectOfLegacySamplesDataManagerDialogForGenericUPb_A;
@@ -142,6 +141,7 @@
 import org.earthtime.projects.projectImporters.UPbProjectImporters.ProjectOfLegacySamplesImporterFromCSVFile_UCSB_LASS_A;
 import org.earthtime.ratioDataModels.AbstractRatiosDataModel;
 import org.earthtime.ratioDataModels.mineralStandardModels.MineralStandardUPbModel;
+import org.earthtime.reduxLabData.ReduxLabData;
 import org.earthtime.reportViews.ReportAliquotFractionsView;
 import org.earthtime.reportViews.ReportPainterI;
 import org.earthtime.reportViews.ReportUpdaterInterface;
@@ -702,9 +702,12 @@ public void setUpTheProject(boolean performReduction) {
                 // oct 2012 register mineralstandardmodel
                 AbstractRatiosDataModel primaryMineralStandard = theProject.getTripoliSession().getPrimaryMineralStandard();
                 if (primaryMineralStandard != null) {
-                    ReduxLabData.getInstance().registerMineralStandardModel(primaryMineralStandard, false);
-                    if (((MineralStandardUPbModel) primaryMineralStandard).hasInitialPb()) {
-                        ReduxLabData.getInstance().registerInitialPbModel(((MineralStandardUPbModel) primaryMineralStandard).getInitialPbModelET(), false);
+                    try {
+                        ReduxLabData.getInstance().registerMineralStandardModel(primaryMineralStandard, false);
+                        if (((MineralStandardUPbModel) primaryMineralStandard).hasInitialPb()) {
+                            ReduxLabData.getInstance().registerInitialPbModel(((MineralStandardUPbModel) primaryMineralStandard).getInitialPbModelET(), false);
+                        }
+                    } catch (BadLabDataException badLabDataException) {
                     }
                 }
             }
@@ -3764,8 +3767,7 @@ private void ID_TIMSLegacyAnalysis_MIT_menuItemActionPerformed(java.awt.event.Ac
 }//GEN-LAST:event_ID_TIMSLegacyAnalysis_MIT_menuItemActionPerformed
 
 private void visitCIRDLESActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_visitCIRDLESActionPerformed
-    BrowserControl.displayURL("https://cirdles.cs.cofc.edu");
-
+    BrowserControl.displayURL("https://cirdles.org");
 }//GEN-LAST:event_visitCIRDLESActionPerformed
 
 private void reportResultsTableAsNumbersInExcel_menuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_reportResultsTableAsNumbersInExcel_menuItemActionPerformed

diff --git a/...java/org/earthtime/Tripoli/dataModels/inputParametersModels/AbstractAcquisitionModel.java b/...java/org/earthtime/Tripoli/dataModels/inputParametersModels/AbstractAcquisitionModel.java
@@ -24,7 +24,7 @@
 import org.earthtime.Tripoli.dataModels.collectorModels.FaradayCollectorModel;
 import org.earthtime.Tripoli.massSpecSetups.AbstractMassSpecSetup;
 import org.earthtime.UPb_Redux.exceptions.BadLabDataException;
-import org.earthtime.UPb_Redux.reduxLabData.ReduxLabData;
+import org.earthtime.reduxLabData.ReduxLabData;
 import org.earthtime.dataDictionaries.AcquisitionTypesEnum;
 import org.earthtime.ratioDataModels.AbstractRatiosDataModel;