diff --git a/AutomaticQC/CTDSurfaceSoakQC.m b/AutomaticQC/CTDSurfaceSoakQC.m index 3620bfc01..ad97048ae 100644 --- a/AutomaticQC/CTDSurfaceSoakQC.m +++ b/AutomaticQC/CTDSurfaceSoakQC.m @@ -27,7 +27,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -39,7 +39,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosCorrMagVelocitySetQC.m b/AutomaticQC/imosCorrMagVelocitySetQC.m index 8b1dcd8fe..5883d13b7 100644 --- a/AutomaticQC/imosCorrMagVelocitySetQC.m +++ b/AutomaticQC/imosCorrMagVelocitySetQC.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosEchoIntensityVelocitySetQC.m b/AutomaticQC/imosEchoIntensityVelocitySetQC.m index 88c0909bb..92351fded 100644 --- a/AutomaticQC/imosEchoIntensityVelocitySetQC.m +++ b/AutomaticQC/imosEchoIntensityVelocitySetQC.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosErrorVelocitySetQC.m b/AutomaticQC/imosErrorVelocitySetQC.m index 86fc341e8..55685baf7 100644 --- a/AutomaticQC/imosErrorVelocitySetQC.m +++ b/AutomaticQC/imosErrorVelocitySetQC.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosGlobalRangeQC.m b/AutomaticQC/imosGlobalRangeQC.m index fee6cfbcb..e4ea65677 100644 --- a/AutomaticQC/imosGlobalRangeQC.m +++ b/AutomaticQC/imosGlobalRangeQC.m @@ -29,7 +29,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -41,7 +41,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosHistoricalManualSetQC.m b/AutomaticQC/imosHistoricalManualSetQC.m index b5c393a9a..c4404dd3b 100644 --- a/AutomaticQC/imosHistoricalManualSetQC.m +++ b/AutomaticQC/imosHistoricalManualSetQC.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosHorizontalVelocitySetQC.m b/AutomaticQC/imosHorizontalVelocitySetQC.m index 43add6c51..3acd3b6b6 100644 --- a/AutomaticQC/imosHorizontalVelocitySetQC.m +++ b/AutomaticQC/imosHorizontalVelocitySetQC.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosImpossibleDateQC.m b/AutomaticQC/imosImpossibleDateQC.m index 20ef4be08..c6a74ab87 100644 --- a/AutomaticQC/imosImpossibleDateQC.m +++ b/AutomaticQC/imosImpossibleDateQC.m @@ -29,7 +29,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -41,7 +41,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosImpossibleDepthQC.m b/AutomaticQC/imosImpossibleDepthQC.m index 1058205c6..6d56786d4 100644 --- a/AutomaticQC/imosImpossibleDepthQC.m +++ b/AutomaticQC/imosImpossibleDepthQC.m @@ -43,7 +43,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -55,7 +55,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosImpossibleLocationSetQC.m b/AutomaticQC/imosImpossibleLocationSetQC.m index 8fe56b303..b8e7f03ad 100644 --- a/AutomaticQC/imosImpossibleLocationSetQC.m +++ b/AutomaticQC/imosImpossibleLocationSetQC.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosInOutWaterQC.m b/AutomaticQC/imosInOutWaterQC.m index 0353752dd..98aa847be 100644 --- a/AutomaticQC/imosInOutWaterQC.m +++ b/AutomaticQC/imosInOutWaterQC.m @@ -28,7 +28,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -40,7 +40,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosPercentGoodVelocitySetQC.m b/AutomaticQC/imosPercentGoodVelocitySetQC.m index 054036d64..fcdb0b0ce 100644 --- a/AutomaticQC/imosPercentGoodVelocitySetQC.m +++ b/AutomaticQC/imosPercentGoodVelocitySetQC.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosRateOfChangeQC.m b/AutomaticQC/imosRateOfChangeQC.m index 12d7e5540..c6bff10a8 100644 --- a/AutomaticQC/imosRateOfChangeQC.m +++ b/AutomaticQC/imosRateOfChangeQC.m @@ -43,7 +43,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -55,7 +55,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosRateOfChangeQCPrep.m b/AutomaticQC/imosRateOfChangeQCPrep.m index e48bd3cce..3b0e72940 100644 --- a/AutomaticQC/imosRateOfChangeQCPrep.m +++ b/AutomaticQC/imosRateOfChangeQCPrep.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosRegionalRangeQC.m b/AutomaticQC/imosRegionalRangeQC.m index aea8d6b7f..eb6fb75b5 100644 --- a/AutomaticQC/imosRegionalRangeQC.m +++ b/AutomaticQC/imosRegionalRangeQC.m @@ -28,7 +28,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -40,7 +40,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosSalinityFromPTQC.m b/AutomaticQC/imosSalinityFromPTQC.m index ca9034f35..bc26aa894 100644 --- a/AutomaticQC/imosSalinityFromPTQC.m +++ b/AutomaticQC/imosSalinityFromPTQC.m @@ -27,7 +27,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -39,7 +39,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosSideLobeVelocitySetQC.m b/AutomaticQC/imosSideLobeVelocitySetQC.m index 28eba64c6..d6898b8ff 100644 --- a/AutomaticQC/imosSideLobeVelocitySetQC.m +++ b/AutomaticQC/imosSideLobeVelocitySetQC.m @@ -34,7 +34,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -46,7 +46,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosStationarityQC.m b/AutomaticQC/imosStationarityQC.m index 6db25e278..2d0eeb805 100644 --- a/AutomaticQC/imosStationarityQC.m +++ b/AutomaticQC/imosStationarityQC.m @@ -29,7 +29,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -41,7 +41,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosTier2ProfileVelocitySetQC.m b/AutomaticQC/imosTier2ProfileVelocitySetQC.m index d8600ed57..ab8b574a0 100644 --- a/AutomaticQC/imosTier2ProfileVelocitySetQC.m +++ b/AutomaticQC/imosTier2ProfileVelocitySetQC.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosTiltVelocitySetQC.m b/AutomaticQC/imosTiltVelocitySetQC.m index 9e64615f7..d242f02dc 100644 --- a/AutomaticQC/imosTiltVelocitySetQC.m +++ b/AutomaticQC/imosTiltVelocitySetQC.m @@ -107,7 +107,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -119,7 +119,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosVerticalSpikeQC.m b/AutomaticQC/imosVerticalSpikeQC.m index 88eddf29a..aa0162fb0 100644 --- a/AutomaticQC/imosVerticalSpikeQC.m +++ b/AutomaticQC/imosVerticalSpikeQC.m @@ -31,7 +31,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -43,7 +43,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/imosVerticalVelocityQC.m b/AutomaticQC/imosVerticalVelocityQC.m index 48419b23a..db202f236 100644 --- a/AutomaticQC/imosVerticalVelocityQC.m +++ b/AutomaticQC/imosVerticalVelocityQC.m @@ -26,7 +26,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -38,7 +38,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/listAutoQCRoutines.m b/AutomaticQC/listAutoQCRoutines.m index 74fc29f13..072033cb8 100644 --- a/AutomaticQC/listAutoQCRoutines.m +++ b/AutomaticQC/listAutoQCRoutines.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/qcFilter.m b/AutomaticQC/qcFilter.m index 3b0858f0c..03edcc3b1 100644 --- a/AutomaticQC/qcFilter.m +++ b/AutomaticQC/qcFilter.m @@ -28,7 +28,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -40,7 +40,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/qcFilterMain.m b/AutomaticQC/qcFilterMain.m index eea9bdc09..7039a2d1d 100644 --- a/AutomaticQC/qcFilterMain.m +++ b/AutomaticQC/qcFilterMain.m @@ -27,7 +27,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -39,7 +39,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -77,29 +77,26 @@ initFlags = sam.(type{m}){k}.flags; - % Set current flag areas - canBeFlagGoodIdx = sam.(type{m}){k}.flags == rawFlag; - - canBeFlagProbGoodIdx = canBeFlagGoodIdx | ... - sam.(type{m}){k}.flags == goodFlag; - - canBeFlagProbBadIdx = canBeFlagProbGoodIdx | ... - sam.(type{m}){k}.flags == probGoodFlag; - - canBeFlagBadIdx = canBeFlagProbBadIdx | ... - sam.(type{m}){k}.flags == probBadFlag; - % Look for the current test flags provided goodIdx = fsam.(type{m}){k}.flags == goodFlag; probGoodIdx = fsam.(type{m}){k}.flags == probGoodFlag; probBadIdx = fsam.(type{m}){k}.flags == probBadFlag; badIdx = fsam.(type{m}){k}.flags == badFlag; - % update new flags in current variable - goodIdx = canBeFlagGoodIdx & goodIdx; - probGoodIdx = canBeFlagProbGoodIdx & probGoodIdx; - probBadIdx = canBeFlagProbBadIdx & probBadIdx; - badIdx = canBeFlagBadIdx & badIdx; + if ~strcmpi(func2str(filter), 'imosHistoricalManualSetQC') % imosHistoricalManualSetQC can downgrade flags + % otherwise we can only upgrade flags + % set current flag areas + canBeFlagGoodIdx = sam.(type{m}){k}.flags == rawFlag; + canBeFlagProbGoodIdx = canBeFlagGoodIdx | sam.(type{m}){k}.flags == goodFlag; + canBeFlagProbBadIdx = canBeFlagProbGoodIdx | sam.(type{m}){k}.flags == probGoodFlag; + canBeFlagBadIdx = canBeFlagProbBadIdx | sam.(type{m}){k}.flags == probBadFlag; + + % update new flags in current variable + goodIdx = canBeFlagGoodIdx & goodIdx; + probGoodIdx = canBeFlagProbGoodIdx & probGoodIdx; + probBadIdx = canBeFlagProbBadIdx & probBadIdx; + badIdx = canBeFlagBadIdx & badIdx; + end sam.(type{m}){k}.flags(goodIdx) = fsam.(type{m}){k}.flags(goodIdx); sam.(type{m}){k}.flags(probGoodIdx) = fsam.(type{m}){k}.flags(probGoodIdx); diff --git a/AutomaticQC/qcFilterPrep.m b/AutomaticQC/qcFilterPrep.m index a4e8f198d..600143b24 100644 --- a/AutomaticQC/qcFilterPrep.m +++ b/AutomaticQC/qcFilterPrep.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/readQCparameter.m b/AutomaticQC/readQCparameter.m index 8718c7237..4aa73e510 100644 --- a/AutomaticQC/readQCparameter.m +++ b/AutomaticQC/readQCparameter.m @@ -30,7 +30,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -42,7 +42,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/teledyneSetQC.m b/AutomaticQC/teledyneSetQC.m index 13eba9ea3..0a5f73de4 100644 --- a/AutomaticQC/teledyneSetQC.m +++ b/AutomaticQC/teledyneSetQC.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/AutomaticQC/writeQCparameter.m b/AutomaticQC/writeQCparameter.m index 59a14dc8b..134a7a559 100644 --- a/AutomaticQC/writeQCparameter.m +++ b/AutomaticQC/writeQCparameter.m @@ -27,7 +27,7 @@ function writeQCparameter(rawDataFile, QCtest, param, value) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -39,7 +39,7 @@ function writeQCparameter(rawDataFile, QCtest, param, value) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/DDB/executeCSVQuery.m b/DDB/executeCSVQuery.m index 3d04fdde3..8d412c072 100644 --- a/DDB/executeCSVQuery.m +++ b/DDB/executeCSVQuery.m @@ -19,7 +19,7 @@ % Author: Rebecca Cowley % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/DDB/executeDDBQuery.m b/DDB/executeDDBQuery.m index 2ef090a5d..facedbc8d 100644 --- a/DDB/executeDDBQuery.m +++ b/DDB/executeDDBQuery.m @@ -30,7 +30,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -42,7 +42,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/FlowManager/autoIMOSToolbox.m b/FlowManager/autoIMOSToolbox.m index 7189ef7c4..c6df048b9 100644 --- a/FlowManager/autoIMOSToolbox.m +++ b/FlowManager/autoIMOSToolbox.m @@ -35,7 +35,7 @@ function autoIMOSToolbox(toolboxVersion, fieldTrip, dataDir, ppChain, qcChain, e % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -47,7 +47,7 @@ function autoIMOSToolbox(toolboxVersion, fieldTrip, dataDir, ppChain, qcChain, e % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/FlowManager/autoQCManager.m b/FlowManager/autoQCManager.m index 9fe97fee5..9a4f03d38 100644 --- a/FlowManager/autoQCManager.m +++ b/FlowManager/autoQCManager.m @@ -24,7 +24,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -36,7 +36,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/FlowManager/displayManager.m b/FlowManager/displayManager.m index a2d862776..8c9d22637 100644 --- a/FlowManager/displayManager.m +++ b/FlowManager/displayManager.m @@ -50,7 +50,7 @@ function displayManager(windowTitle, sample_data, callbacks) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -62,7 +62,7 @@ function displayManager(windowTitle, sample_data, callbacks) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/FlowManager/exportManager.m b/FlowManager/exportManager.m index 4b3999b22..58633ea7f 100644 --- a/FlowManager/exportManager.m +++ b/FlowManager/exportManager.m @@ -18,7 +18,7 @@ function exportManager(dataSets, levelNames, output, auto) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ function exportManager(dataSets, levelNames, output, auto) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -119,7 +119,8 @@ function exportManager(dataSets, levelNames, output, auto) filenames{end+1} = exportRawData(dataSets{k}, exportDir, setNames{k}); end if ~auto - waitbar(k / nDataSets, progress, ['Exported ' filenames{end}]); + [~, radFile, ext] = fileparts(filenames{end}); + waitbar(k / nDataSets, progress, [radFile ext]); end catch e diff --git a/FlowManager/flowManager.m b/FlowManager/flowManager.m index f70433b5b..33168d33a 100644 --- a/FlowManager/flowManager.m +++ b/FlowManager/flowManager.m @@ -10,7 +10,7 @@ function flowManager(toolboxVersion) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -22,7 +22,7 @@ function flowManager(toolboxVersion) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/FlowManager/importManager.m b/FlowManager/importManager.m index 156a54563..324d7299d 100644 --- a/FlowManager/importManager.m +++ b/FlowManager/importManager.m @@ -35,7 +35,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -47,7 +47,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/FlowManager/preprocessManager.m b/FlowManager/preprocessManager.m index 0e9f5ae57..6aaec7c14 100644 --- a/FlowManager/preprocessManager.m +++ b/FlowManager/preprocessManager.m @@ -23,7 +23,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -35,7 +35,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/addFlagDialog.m b/GUI/addFlagDialog.m index c063d0233..96da108e4 100644 --- a/GUI/addFlagDialog.m +++ b/GUI/addFlagDialog.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/dataFileStatusDialog.m b/GUI/dataFileStatusDialog.m index 5e65e6350..7e211fe5f 100644 --- a/GUI/dataFileStatusDialog.m +++ b/GUI/dataFileStatusDialog.m @@ -28,7 +28,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -40,7 +40,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/datePromptDialog.m b/GUI/datePromptDialog.m index 7540a1a36..f5c0fd731 100644 --- a/GUI/datePromptDialog.m +++ b/GUI/datePromptDialog.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/exportDialog.m b/GUI/exportDialog.m index 375f7c6df..8a745378a 100644 --- a/GUI/exportDialog.m +++ b/GUI/exportDialog.m @@ -32,7 +32,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -44,7 +44,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/listSelectionDialog.m b/GUI/listSelectionDialog.m index e8ddccd32..73ac14939 100644 --- a/GUI/listSelectionDialog.m +++ b/GUI/listSelectionDialog.m @@ -29,7 +29,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -41,7 +41,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/mainWindow.m b/GUI/mainWindow.m index 6a5c39c3a..129c8922d 100644 --- a/GUI/mainWindow.m +++ b/GUI/mainWindow.m @@ -56,7 +56,7 @@ function mainWindow(... % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -68,7 +68,7 @@ function mainWindow(... % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -253,10 +253,10 @@ function mainWindow(... tb = findall(fig, 'Type', 'uitoolbar'); buttons = findall(tb); - zoomoutb = findobj(buttons, 'TooltipString', 'Zoom Out'); - zoominb = findobj(buttons, 'TooltipString', 'Zoom In'); - panb = findobj(buttons, 'TooltipString', 'Pan'); - datacursorb = findobj(buttons, 'TooltipString', 'Data Cursor'); + zoomoutb = findobj(buttons, 'TooltipString', 'Zoom Out'); + zoominb = findobj(buttons, 'TooltipString', 'Zoom In'); + panb = findobj(buttons, 'TooltipString', 'Pan'); + datacursorb = findobj(buttons, 'TooltipString', 'Data Cursor'); buttons(buttons == tb) = []; buttons(buttons == zoomoutb) = []; @@ -365,7 +365,30 @@ function sampleMenuCallback(source,ev) % menu. Updates the variables panel, then delegates to selectionChange. % sam = getSelectedData(); + + % keep track of previously selected variables + iTickBox = getSelectedVars(); + nTickBoxed = length(iTickBox); + selectedVarNames = cell(1, nTickBoxed); + tickBoxes = get(varPanel, 'UserData'); + for i=1:nTickBoxed + selectedVarNames{i} = get(tickBoxes(iTickBox(i)), 'String'); + end + + % reset the varPanel + newVars = []; createVarPanel(sam, []); + + % we want to be able to keep the selected variables from one dataset to another if possible + newTickBoxes = get(varPanel, 'UserData'); + for j=1:length(newTickBoxes) + varName = get(newTickBoxes(j), 'String'); + if any(strcmp(varName, selectedVarNames)) + newVars = [newVars j]; + end + end + + if ~isempty(newVars), createVarPanel(sam, newVars); end selectionChange('set'); end @@ -451,13 +474,41 @@ function zoomPostCallback(source,ev) set(graphs, 'XLim', xLimits); set(graphs, 'XTick', xTicks); - % reset other 1D axis yTicks if needed because the X axis sync causes a - % change in the Y range + % update other 1D axis yLim / yTick to reflect the + % change in the Y range of displayed data if ~isempty(graphs1D) + sam = getSelectedData(); + hTickBoxes = get(varPanel, 'UserData'); + + qcSet = str2double(readProperty('toolbox.qc_set')); + rawFlag = imosQCFlag('raw', qcSet, 'flag'); + goodFlag = imosQCFlag('good', qcSet, 'flag'); + pGoodFlag = imosQCFlag('probablyGood', qcSet, 'flag'); + okFlags = [rawFlag goodFlag pGoodFlag]; + for i=1:length(graphs1D) - yLimits = get(graphs1D(i), 'YLim'); + userData = get(graphs1D(i), 'UserData'); + hData = userData{1}; + iTickBox = userData{2}; + + varName = get(hTickBoxes(iTickBox), 'String'); + iVar = getVar(sam.variables, varName); + flags = sam.variables{iVar}.flags; + iGood = ismember(flags, okFlags); + + xData = get(hData, 'XData'); + yData = get(hData, 'YData'); + + xData(~iGood) = []; + yData(~iGood) = []; + + iDataIn = xData >= xLimits(1) & xData <= xLimits(2); + yLimits = [min(yData(iDataIn)), max(yData(iDataIn))]; + set(graphs1D(i), 'YLim', yLimits); + yStep = (yLimits(2) - yLimits(1)) / 5; yTicks = yLimits(1):yStep:yLimits(2); + set(graphs1D(i), 'YTick', yTicks); end end diff --git a/GUI/optionDialog.m b/GUI/optionDialog.m index 3a836e0ba..cc906bc16 100644 --- a/GUI/optionDialog.m +++ b/GUI/optionDialog.m @@ -23,7 +23,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -35,7 +35,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/propertyDialog.m b/GUI/propertyDialog.m index f8fea2610..028cac2b5 100644 --- a/GUI/propertyDialog.m +++ b/GUI/propertyDialog.m @@ -19,7 +19,7 @@ function propertyDialog( filename, delim ) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ function propertyDialog( filename, delim ) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/siteDialog.m b/GUI/siteDialog.m index 2671b17e1..6721cfdd6 100644 --- a/GUI/siteDialog.m +++ b/GUI/siteDialog.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/startDialog.m b/GUI/startDialog.m index 9b17f87c7..642bb1fb3 100644 --- a/GUI/startDialog.m +++ b/GUI/startDialog.m @@ -25,7 +25,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -37,7 +37,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/tabbedPane.m b/GUI/tabbedPane.m index 3df2920cd..5bba0b33b 100644 --- a/GUI/tabbedPane.m +++ b/GUI/tabbedPane.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/updateViewMetadata.m b/GUI/updateViewMetadata.m index f3d3c7961..70595df02 100644 --- a/GUI/updateViewMetadata.m +++ b/GUI/updateViewMetadata.m @@ -17,7 +17,7 @@ function updateViewMetadata(parent, sample_data, mode) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ function updateViewMetadata(parent, sample_data, mode) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/viewMetadata.m b/GUI/viewMetadata.m index eb614168b..104cb9ca9 100644 --- a/GUI/viewMetadata.m +++ b/GUI/viewMetadata.m @@ -32,7 +32,7 @@ function viewMetadata(parent, sample_data, updateCallback, repCallback, mode) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -44,7 +44,7 @@ function viewMetadata(parent, sample_data, updateCallback, repCallback, mode) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/GUI/viewQCstats.m b/GUI/viewQCstats.m index 9a638d0da..623d073ba 100644 --- a/GUI/viewQCstats.m +++ b/GUI/viewQCstats.m @@ -15,7 +15,7 @@ function viewQCstats(parent, sample_data, mode) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ function viewQCstats(parent, sample_data, mode) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Geomag/geomag70.m b/Geomag/geomag70.m index 31fd2c0f8..71e189b78 100644 --- a/Geomag/geomag70.m +++ b/Geomag/geomag70.m @@ -6,7 +6,7 @@ % **inclination I, horizontal intensity H, and total intensity F as a % **function of Julian day JD, latitude LAT, and longitude LON. -% Copyright (c) 2015, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -18,7 +18,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/DepthProfile/flagDepthProfileGeneric.m b/Graph/DepthProfile/flagDepthProfileGeneric.m index 99bb07163..41d23b602 100644 --- a/Graph/DepthProfile/flagDepthProfileGeneric.m +++ b/Graph/DepthProfile/flagDepthProfileGeneric.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/DepthProfile/getSelectedDepthProfileGeneric.m b/Graph/DepthProfile/getSelectedDepthProfileGeneric.m index b06f9b482..95c866dcc 100644 --- a/Graph/DepthProfile/getSelectedDepthProfileGeneric.m +++ b/Graph/DepthProfile/getSelectedDepthProfileGeneric.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/DepthProfile/graphDepthProfileGeneric.m b/Graph/DepthProfile/graphDepthProfileGeneric.m index d05574f7f..073fed0a9 100644 --- a/Graph/DepthProfile/graphDepthProfileGeneric.m +++ b/Graph/DepthProfile/graphDepthProfileGeneric.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/DepthProfile/highlightDepthProfileGeneric.m b/Graph/DepthProfile/highlightDepthProfileGeneric.m index bf9ac389d..2bd90cc35 100644 --- a/Graph/DepthProfile/highlightDepthProfileGeneric.m +++ b/Graph/DepthProfile/highlightDepthProfileGeneric.m @@ -23,7 +23,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -35,7 +35,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/DepthProfile/selectDepthProfileGeneric.m b/Graph/DepthProfile/selectDepthProfileGeneric.m index c5825317a..b30fd3729 100644 --- a/Graph/DepthProfile/selectDepthProfileGeneric.m +++ b/Graph/DepthProfile/selectDepthProfileGeneric.m @@ -15,7 +15,7 @@ function selectDepthProfileGeneric( selectCallback, clickCallback ) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ function selectDepthProfileGeneric( selectCallback, clickCallback ) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/flagTimeSeriesGeneric.m b/Graph/TimeSeries/flagTimeSeriesGeneric.m index c8e5d8c42..c0f767e29 100644 --- a/Graph/TimeSeries/flagTimeSeriesGeneric.m +++ b/Graph/TimeSeries/flagTimeSeriesGeneric.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/flagTimeSeriesTimeDepth.m b/Graph/TimeSeries/flagTimeSeriesTimeDepth.m index 6397cfbd6..d04b05fca 100644 --- a/Graph/TimeSeries/flagTimeSeriesTimeDepth.m +++ b/Graph/TimeSeries/flagTimeSeriesTimeDepth.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/flagTimeSeriesTimeFrequency.m b/Graph/TimeSeries/flagTimeSeriesTimeFrequency.m index d17491cdb..b505bfd3d 100644 --- a/Graph/TimeSeries/flagTimeSeriesTimeFrequency.m +++ b/Graph/TimeSeries/flagTimeSeriesTimeFrequency.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/flagTimeSeriesTimeFrequencyDirection.m b/Graph/TimeSeries/flagTimeSeriesTimeFrequencyDirection.m index f6a28e7b0..60087fd20 100644 --- a/Graph/TimeSeries/flagTimeSeriesTimeFrequencyDirection.m +++ b/Graph/TimeSeries/flagTimeSeriesTimeFrequencyDirection.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/getSelectedTimeSeriesGeneric.m b/Graph/TimeSeries/getSelectedTimeSeriesGeneric.m index 1e854fb2c..7eeb65bb0 100644 --- a/Graph/TimeSeries/getSelectedTimeSeriesGeneric.m +++ b/Graph/TimeSeries/getSelectedTimeSeriesGeneric.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/getSelectedTimeSeriesTimeDepth.m b/Graph/TimeSeries/getSelectedTimeSeriesTimeDepth.m index c8dd0b67c..a434e61f4 100644 --- a/Graph/TimeSeries/getSelectedTimeSeriesTimeDepth.m +++ b/Graph/TimeSeries/getSelectedTimeSeriesTimeDepth.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/getSelectedTimeSeriesTimeFrequency.m b/Graph/TimeSeries/getSelectedTimeSeriesTimeFrequency.m index 703d3b737..1768510b1 100644 --- a/Graph/TimeSeries/getSelectedTimeSeriesTimeFrequency.m +++ b/Graph/TimeSeries/getSelectedTimeSeriesTimeFrequency.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/getSelectedTimeSeriesTimeFrequencyDirection.m b/Graph/TimeSeries/getSelectedTimeSeriesTimeFrequencyDirection.m index ce2b97093..64a7b4670 100644 --- a/Graph/TimeSeries/getSelectedTimeSeriesTimeFrequencyDirection.m +++ b/Graph/TimeSeries/getSelectedTimeSeriesTimeFrequencyDirection.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/graphTimeSeriesGeneric.m b/Graph/TimeSeries/graphTimeSeriesGeneric.m index 2e49fe8fb..ff2a2b4b4 100644 --- a/Graph/TimeSeries/graphTimeSeriesGeneric.m +++ b/Graph/TimeSeries/graphTimeSeriesGeneric.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/graphTimeSeriesTimeDepth.m b/Graph/TimeSeries/graphTimeSeriesTimeDepth.m index 9591d5c08..ce2b20c13 100644 --- a/Graph/TimeSeries/graphTimeSeriesTimeDepth.m +++ b/Graph/TimeSeries/graphTimeSeriesTimeDepth.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/graphTimeSeriesTimeFrequency.m b/Graph/TimeSeries/graphTimeSeriesTimeFrequency.m index dd3104f66..5f4cfae0f 100644 --- a/Graph/TimeSeries/graphTimeSeriesTimeFrequency.m +++ b/Graph/TimeSeries/graphTimeSeriesTimeFrequency.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/graphTimeSeriesTimeFrequencyDirection.m b/Graph/TimeSeries/graphTimeSeriesTimeFrequencyDirection.m index b21ea13a8..7acdb14cc 100644 --- a/Graph/TimeSeries/graphTimeSeriesTimeFrequencyDirection.m +++ b/Graph/TimeSeries/graphTimeSeriesTimeFrequencyDirection.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/highlightTimeSeriesGeneric.m b/Graph/TimeSeries/highlightTimeSeriesGeneric.m index fcffb7876..5e17afbcd 100644 --- a/Graph/TimeSeries/highlightTimeSeriesGeneric.m +++ b/Graph/TimeSeries/highlightTimeSeriesGeneric.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/highlightTimeSeriesTimeDepth.m b/Graph/TimeSeries/highlightTimeSeriesTimeDepth.m index a1091a2f3..76279faa7 100644 --- a/Graph/TimeSeries/highlightTimeSeriesTimeDepth.m +++ b/Graph/TimeSeries/highlightTimeSeriesTimeDepth.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/highlightTimeSeriesTimeFrequency.m b/Graph/TimeSeries/highlightTimeSeriesTimeFrequency.m index 33e8dd325..351cc25eb 100644 --- a/Graph/TimeSeries/highlightTimeSeriesTimeFrequency.m +++ b/Graph/TimeSeries/highlightTimeSeriesTimeFrequency.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/highlightTimeSeriesTimeFrequencyDirection.m b/Graph/TimeSeries/highlightTimeSeriesTimeFrequencyDirection.m index efb4afd39..5ab1a3aad 100644 --- a/Graph/TimeSeries/highlightTimeSeriesTimeFrequencyDirection.m +++ b/Graph/TimeSeries/highlightTimeSeriesTimeFrequencyDirection.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/selectTimeSeriesGeneric.m b/Graph/TimeSeries/selectTimeSeriesGeneric.m index 993b32c9a..b7473f7e5 100644 --- a/Graph/TimeSeries/selectTimeSeriesGeneric.m +++ b/Graph/TimeSeries/selectTimeSeriesGeneric.m @@ -44,7 +44,7 @@ function selectTimeSeriesGeneric( selectCallback, clickCallback ) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -56,7 +56,7 @@ function selectTimeSeriesGeneric( selectCallback, clickCallback ) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/TimeSeries/setTimeSerieColorbarContextMenu.m b/Graph/TimeSeries/setTimeSerieColorbarContextMenu.m index 8892cbcbc..49acca397 100644 --- a/Graph/TimeSeries/setTimeSerieColorbarContextMenu.m +++ b/Graph/TimeSeries/setTimeSerieColorbarContextMenu.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/Transect/flagTransectGeneric.m b/Graph/Transect/flagTransectGeneric.m index d1dea288f..3fff545e8 100644 --- a/Graph/Transect/flagTransectGeneric.m +++ b/Graph/Transect/flagTransectGeneric.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/Transect/getSelectedTransectGeneric.m b/Graph/Transect/getSelectedTransectGeneric.m index aad06720b..168c7d26c 100644 --- a/Graph/Transect/getSelectedTransectGeneric.m +++ b/Graph/Transect/getSelectedTransectGeneric.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/Transect/graphTransectGeneric.m b/Graph/Transect/graphTransectGeneric.m index 0b75660e1..18d2333ae 100644 --- a/Graph/Transect/graphTransectGeneric.m +++ b/Graph/Transect/graphTransectGeneric.m @@ -15,7 +15,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/Transect/highlightTransectGeneric.m b/Graph/Transect/highlightTransectGeneric.m index 7130673e5..509b671c2 100644 --- a/Graph/Transect/highlightTransectGeneric.m +++ b/Graph/Transect/highlightTransectGeneric.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/Transect/selectTransectGeneric.m b/Graph/Transect/selectTransectGeneric.m index b7d461353..5bbc73276 100644 --- a/Graph/Transect/selectTransectGeneric.m +++ b/Graph/Transect/selectTransectGeneric.m @@ -15,7 +15,7 @@ function selectTransectGeneric( selectCallback, clickCallback ) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ function selectTransectGeneric( selectCallback, clickCallback ) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/checkMooringPlannedDepths.m b/Graph/checkMooringPlannedDepths.m index baa243831..434c517d0 100644 --- a/Graph/checkMooringPlannedDepths.m +++ b/Graph/checkMooringPlannedDepths.m @@ -19,7 +19,7 @@ function checkMooringPlannedDepths(sample_data, isQC, saveToFile, exportDir) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ function checkMooringPlannedDepths(sample_data, isQC, saveToFile, exportDir) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/checkMooringPresDiffs.m b/Graph/checkMooringPresDiffs.m index f3c0273c8..fbd381bdb 100644 --- a/Graph/checkMooringPresDiffs.m +++ b/Graph/checkMooringPresDiffs.m @@ -19,7 +19,7 @@ function checkMooringPresDiffs(sample_data, iSampleMenu, isQC, saveToFile, expor % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ function checkMooringPresDiffs(sample_data, iSampleMenu, isQC, saveToFile, expor % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/flagDepthProfile.m b/Graph/flagDepthProfile.m index c5bc4e274..94c6d20e9 100644 --- a/Graph/flagDepthProfile.m +++ b/Graph/flagDepthProfile.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/flagTimeSeries.m b/Graph/flagTimeSeries.m index f1033a9c0..3e0221118 100644 --- a/Graph/flagTimeSeries.m +++ b/Graph/flagTimeSeries.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/flagTransect.m b/Graph/flagTransect.m index b0b76fa10..b2f3fd280 100644 --- a/Graph/flagTransect.m +++ b/Graph/flagTransect.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/getGraphFunc.m b/Graph/getGraphFunc.m index 3bc66cd20..464888032 100644 --- a/Graph/getGraphFunc.m +++ b/Graph/getGraphFunc.m @@ -53,7 +53,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -65,7 +65,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/graphDepthProfile.m b/Graph/graphDepthProfile.m index 69b264289..7141c399c 100644 --- a/Graph/graphDepthProfile.m +++ b/Graph/graphDepthProfile.m @@ -24,7 +24,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -36,7 +36,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/graphTimeSeries.m b/Graph/graphTimeSeries.m index e405e2ff0..5e8a6f0ce 100644 --- a/Graph/graphTimeSeries.m +++ b/Graph/graphTimeSeries.m @@ -23,7 +23,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -35,7 +35,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/graphTransect.m b/Graph/graphTransect.m index 1d46ad1f6..3b8163905 100644 --- a/Graph/graphTransect.m +++ b/Graph/graphTransect.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/graphXvY.m b/Graph/graphXvY.m index 0ac471544..018f80482 100644 --- a/Graph/graphXvY.m +++ b/Graph/graphXvY.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/lineCastVar.m b/Graph/lineCastVar.m index 9d0cd51a4..d90d676fc 100644 --- a/Graph/lineCastVar.m +++ b/Graph/lineCastVar.m @@ -18,7 +18,7 @@ function lineCastVar(sample_data, varNames, isQC, saveToFile, exportDir) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ function lineCastVar(sample_data, varNames, isQC, saveToFile, exportDir) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/lineMooring1DVar.m b/Graph/lineMooring1DVar.m index 8b3eeeef4..d6332e9bc 100644 --- a/Graph/lineMooring1DVar.m +++ b/Graph/lineMooring1DVar.m @@ -18,7 +18,7 @@ function lineMooring1DVar(sample_data, varName, isQC, saveToFile, exportDir) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ function lineMooring1DVar(sample_data, varName, isQC, saveToFile, exportDir) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/lineMooring2DVarSection.m b/Graph/lineMooring2DVarSection.m index 3db00ce13..632710c2d 100644 --- a/Graph/lineMooring2DVarSection.m +++ b/Graph/lineMooring2DVarSection.m @@ -20,7 +20,7 @@ function lineMooring2DVarSection(sample_data, varName, timeValue, isQC, saveToFi % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ function lineMooring2DVarSection(sample_data, varName, timeValue, isQC, saveToFi % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/listGraphs.m b/Graph/listGraphs.m index d89c0f375..b92b42682 100644 --- a/Graph/listGraphs.m +++ b/Graph/listGraphs.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/pcolorMooring2DVar.m b/Graph/pcolorMooring2DVar.m index f209ef8c9..762e174d3 100644 --- a/Graph/pcolorMooring2DVar.m +++ b/Graph/pcolorMooring2DVar.m @@ -18,7 +18,7 @@ function pcolorMooring2DVar(sample_data, varName, isQC, saveToFile, exportDir) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ function pcolorMooring2DVar(sample_data, varName, isQC, saveToFile, exportDir) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Graph/scatterMooring1DVarAgainstDepth.m b/Graph/scatterMooring1DVarAgainstDepth.m index 49dbd4d1f..34d3f95e7 100644 --- a/Graph/scatterMooring1DVarAgainstDepth.m +++ b/Graph/scatterMooring1DVarAgainstDepth.m @@ -18,7 +18,7 @@ function scatterMooring1DVarAgainstDepth(sample_data, varName, isQC, saveToFile, % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ function scatterMooring1DVarAgainstDepth(sample_data, varName, isQC, saveToFile, % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -299,18 +299,21 @@ function scatterMooring1DVarAgainstDepth(sample_data, varName, isQC, saveToFile, depth, ... sample_data{iSort(i)}.variables{izVar}.data(iGood), ... markerStyle{mod(i, lenMarkerStyle)+1}, ... - [minClim maxClim], 'DisplayName', instrumentDesc{i+1},'UserData', userData); + [minClim maxClim], ... + 'DisplayName', instrumentDesc{i+1}, ... + 'MarkerSize', 2.5, ... + 'UserData', userData); else % faster than scatter, but legend requires adjusting - h = fastScatterMesh( hAxMooringVar,... - sample_data{iSort(i)}.dimensions{iTime}.data(iGood),... - depth,... - sample_data{iSort(i)}.variables{izVar}.data(iGood),... - [minClim maxClim],... - 'Marker',markerStyle{mod(i, lenMarkerStyle)+1},... - 'MarkerSize',2.5,... - 'DisplayName',[markerStyle{mod(i, lenMarkerStyle)+1} ' ' instrumentDesc{i+1}],... - 'UserData', userData); + h = fastScatterMesh( hAxMooringVar, ... + sample_data{iSort(i)}.dimensions{iTime}.data(iGood), ... + depth, ... + sample_data{iSort(i)}.variables{izVar}.data(iGood), ... + [minClim maxClim], ... + 'Marker', markerStyle{mod(i, lenMarkerStyle)+1}, ... + 'DisplayName', [markerStyle{mod(i, lenMarkerStyle)+1} ' ' instrumentDesc{i+1}], ... + 'MarkerSize', 2.5, ... + 'UserData', userData); end clear('userData'); diff --git a/Graph/scatterMooring2DVarAgainstDepth.m b/Graph/scatterMooring2DVarAgainstDepth.m index a1430c958..92b180f83 100644 --- a/Graph/scatterMooring2DVarAgainstDepth.m +++ b/Graph/scatterMooring2DVarAgainstDepth.m @@ -18,7 +18,7 @@ function scatterMooring2DVarAgainstDepth(sample_data, varName, isQC, saveToFile, % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ function scatterMooring2DVarAgainstDepth(sample_data, varName, isQC, saveToFile, % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -386,19 +386,20 @@ function scatterMooring2DVarAgainstDepth(sample_data, varName, isQC, saveToFile, dataVar(:, j), ... markerStyle{mod(i, lenMarkerStyle)+1}, ... CLim,... - 'DisplayName',instrumentDesc{i+1},... - 'UserData', userData); + 'DisplayName', instrumentDesc{i+1}, ... + 'MarkerSize', 2.5, ... + 'UserData', userData); else % faster than scatter, but legend requires adjusting - h = fastScatterMesh( hAxMooringVar,... - xScatter,... - dataDepth - yScatter(j),... - dataVar(:, j),... - CLim,... - 'Marker',markerStyle{mod(i, lenMarkerStyle)+1},... - 'MarkerSize',2.5,... - 'DisplayName',instrumentDesc{i+1},... - 'UserData', userData); + h = fastScatterMesh( hAxMooringVar, ... + xScatter, ... + dataDepth - yScatter(j), ... + dataVar(:, j), ... + CLim, ... + 'Marker', markerStyle{mod(i, lenMarkerStyle)+1}, ... + 'DisplayName', instrumentDesc{i+1}, ... + 'MarkerSize', 2.5, ... + 'UserData', userData); end clear('userData'); diff --git a/IMOS/finaliseData.m b/IMOS/finaliseData.m index 5bdceddca..521777368 100644 --- a/IMOS/finaliseData.m +++ b/IMOS/finaliseData.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/IMOS/genIMOSFileName.m b/IMOS/genIMOSFileName.m index 311e482d4..bd3a9c5ca 100644 --- a/IMOS/genIMOSFileName.m +++ b/IMOS/genIMOSFileName.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/IMOS/imosFileVersion.m b/IMOS/imosFileVersion.m index 36926b7c0..11f31c55a 100644 --- a/IMOS/imosFileVersion.m +++ b/IMOS/imosFileVersion.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/IMOS/imosFileVersion.txt b/IMOS/imosFileVersion.txt index 0272c5998..c2613aeff 100644 --- a/IMOS/imosFileVersion.txt +++ b/IMOS/imosFileVersion.txt @@ -4,7 +4,7 @@ % index, file ID, name, description % 0, FV00, Level 0 - Raw data, Raw data is defined as unprocessed data and data products that have not undergone quality control. The data may be in engineering physical units, time and location details can be in relative units and values can be pre-calibration measurements. -1, FV01, Level 1 - Quality Controlled Data, Quality controlled data have been through quality assurance procedures such as automated routines and sensor calibration or visual inspection and flag of obvious errors. The data are in physical units using standard SI metric units with calibration and other pre-processing routines applied, all time and location values are in absolute coordinates to comply with standards and datum. Data includes flags for each measurments to indicate the estimated quality of the measurement. Metadata exists for the data or for the higher level dataset that the data belongs to. This is the standard IMOS data level and is what should be made available to eMII and to the IMOS community. +1, FV01, Level 1 - Quality Controlled Data, Quality controlled data have been through quality assurance procedures such as automated routines and sensor calibration or visual inspection and flag of obvious errors. The data are in physical units using standard SI metric units with calibration and other pre-processing routines applied, all time and location values are in absolute coordinates to comply with standards and datum. Data includes flags for each measurments to indicate the estimated quality of the measurement. Metadata exists for the data or for the higher level dataset that the data belongs to. This is the standard IMOS data level and is what should be made available to AODN and to the IMOS community. 2, FV02, Level 2 - Derived Products, Derived products require scientific and technical interpretation. Normally these will be defined by the community that collects or utilises the data. 3, FV03, Level 3 - Interpreted Products, These products require researcher driven analysis and interpretation, model based interpretation using other data and / or strong prior assumptions. 4, FV04, Level 4 - Knowledge Products, These products require researcher driven scientific interpretation and multidisciplinary data integration and include model-based interpretation using other data and / or strong prior assumptions. diff --git a/IMOS/imosParameters.m b/IMOS/imosParameters.m index 1af0dc3a5..b931c1a18 100644 --- a/IMOS/imosParameters.m +++ b/IMOS/imosParameters.m @@ -30,7 +30,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -42,7 +42,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/IMOS/imosQCFlag.m b/IMOS/imosQCFlag.m index 606d7e5c3..a7b0d161e 100644 --- a/IMOS/imosQCFlag.m +++ b/IMOS/imosQCFlag.m @@ -43,7 +43,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -55,7 +55,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/IMOS/imosSites.m b/IMOS/imosSites.m index 434775846..1331faa52 100644 --- a/IMOS/imosSites.m +++ b/IMOS/imosSites.m @@ -13,8 +13,8 @@ % -name % -longitude % -latitude -% -latitudePlusMinusThreshold % -longitudePlusMinusThreshold +% -latitudePlusMinusThreshold % -distanceKmPlusMinusThreshold (optional, % if documented overrules previous thresholds values) % @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -85,8 +85,8 @@ site.name = params{1}{iName}; site.longitude = params{2}(iName); site.latitude = params{3}(iName); - site.latitudePlusMinusThreshold = params{4}(iName); - site.longitudePlusMinusThreshold = params{5}(iName); + site.longitudePlusMinusThreshold = params{4}(iName); + site.latitudePlusMinusThreshold = params{5}(iName); site.distanceKmPlusMinusThreshold = params{6}(iName); else return; diff --git a/Java/ddb.jar b/Java/ddb.jar index ec8384cce..397eeff22 100644 Binary files a/Java/ddb.jar and b/Java/ddb.jar differ diff --git a/Java/src/org/imos/ddb/DBObject.java b/Java/src/org/imos/ddb/DBObject.java index 4b3b2f698..d4a8a7c59 100644 --- a/Java/src/org/imos/ddb/DBObject.java +++ b/Java/src/org/imos/ddb/DBObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated + * Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated * Marine Observing System (IMOS). * All rights reserved. * @@ -11,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the eMII/IMOS nor the names of its contributors + * * Neither the name of the AODN/IMOS nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/Java/src/org/imos/ddb/DDB.java b/Java/src/org/imos/ddb/DDB.java index 66e048054..789dd899f 100644 --- a/Java/src/org/imos/ddb/DDB.java +++ b/Java/src/org/imos/ddb/DDB.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated + * Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated * Marine Observing System (IMOS). * All rights reserved. * @@ -11,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the eMII/IMOS nor the names of its contributors + * * Neither the name of the AODN/IMOS nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/Java/src/org/imos/ddb/JDBCDDB.java b/Java/src/org/imos/ddb/JDBCDDB.java index 387610d88..f6dc18ec9 100644 --- a/Java/src/org/imos/ddb/JDBCDDB.java +++ b/Java/src/org/imos/ddb/JDBCDDB.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated + * Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated * Marine Observing System (IMOS). * All rights reserved. * @@ -11,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the eMII/IMOS nor the names of its contributors + * * Neither the name of the AODN/IMOS nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/Java/src/org/imos/ddb/ODBCDDB.java b/Java/src/org/imos/ddb/ODBCDDB.java index 7547cc297..38b1356cd 100644 --- a/Java/src/org/imos/ddb/ODBCDDB.java +++ b/Java/src/org/imos/ddb/ODBCDDB.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated + * Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated * Marine Observing System (IMOS). * All rights reserved. * @@ -11,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the eMII/IMOS nor the names of its contributors + * * Neither the name of the AODN/IMOS nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/Java/src/org/imos/ddb/Test.java b/Java/src/org/imos/ddb/Test.java index f0f25e9c6..7119ba8fe 100644 --- a/Java/src/org/imos/ddb/Test.java +++ b/Java/src/org/imos/ddb/Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated + * Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated * Marine Observing System (IMOS). * All rights reserved. * @@ -11,7 +11,7 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of the eMII/IMOS nor the names of its contributors + * * Neither the name of the AODN/IMOS nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -66,13 +66,15 @@ public static void main(String[] args) { String odbcArgs = "/home/ggalibert/Documents/IMOS_toolbox/data_files_examples/AIMS/Paul_Rigby/OceanDB.mdb"; // String odbcArgs = "/home/ggalibert/Documents/IMOS_toolbox/data_files_examples/AIMS/new_ddb/OceanDB_Unreplicated.mdb"; - String driver = "net.ucanaccess.jdbc.UcanaccessDriver"; +// String driver = "net.ucanaccess.jdbc.UcanaccessDriver"; + String driver = "org.postgresql.Driver"; String mdbFile = "/home/ggalibert/Documents/IMOS_toolbox/data_files_examples/NSW/OceanDB2015.mdb"; // String mdbFile = "/home/ggalibert/Documents/IMOS_toolbox/data_files_examples/AIMS/Paul_Rigby/OceanDB.mdb"; // String connection = "jdbc:ucanaccess://" + mdbFile + ";jackcessOpener=org.imos.ddb.CryptCodecOpener;SingleConnection=true"; - String connection = "jdbc:ucanaccess://" + mdbFile + ";jackcessOpener=org.imos.ddb.CryptCodecOpener"; - String user = ""; - String password = ""; +// String connection = "jdbc:ucanaccess://" + mdbFile + ";jackcessOpener=org.imos.ddb.CryptCodecOpener"; + String connection = "jdbc:postgresql://localhost/Darren_2016-03-24"; + String user = "myUser"; + String password = "myPassword"; String[] jdbcArgs = new String[4]; jdbcArgs[0] = driver; jdbcArgs[1] = connection; @@ -104,7 +106,7 @@ public static void main(String[] args) { try { - ArrayList trips = mdb.executeQuery("FieldTrip", null, null); + ArrayList trips = mdb.executeQuery("FieldTrip", "FieldTripID", "NRSMAI-2015-06-26"); for (Object o : trips) printObj(o); // ArrayList deps = mdb.executeQuery("DeploymentData", null, null); diff --git a/NetCDF/exportNetCDF.m b/NetCDF/exportNetCDF.m index 55c0f4329..369970c1b 100644 --- a/NetCDF/exportNetCDF.m +++ b/NetCDF/exportNetCDF.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -299,7 +299,7 @@ fprintf('%s\n', ['Warning : in ' filename ', the variable ' ... varname ' has been created with a chunk size not ' ... 'optimised for any 2D representation (slower performance).' ... - ' Please inform eMII.']); + ' Please inform AODN.']); end if ~isempty(dimLen) diff --git a/NetCDF/makeNetCDFCompliant.m b/NetCDF/makeNetCDFCompliant.m index 2eca38e76..5a71ca8f8 100644 --- a/NetCDF/makeNetCDFCompliant.m +++ b/NetCDF/makeNetCDFCompliant.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/NetCDF/parseNetCDFTemplate.m b/NetCDF/parseNetCDFTemplate.m index 824b7bb34..5aae4145a 100644 --- a/NetCDF/parseNetCDFTemplate.m +++ b/NetCDF/parseNetCDFTemplate.m @@ -150,7 +150,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -162,7 +162,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/NetCDF/template/global_attributes_profile.txt b/NetCDF/template/global_attributes_profile.txt index d5e407989..8a3cb85fa 100644 --- a/NetCDF/template/global_attributes_profile.txt +++ b/NetCDF/template/global_attributes_profile.txt @@ -61,13 +61,13 @@ D, time_coverage_start = D, time_coverage_end = % who -S, data_centre = eMarine Information Infrastructure (eMII) -S, data_centre_email = info@emii.org.au +S, data_centre = Australian Ocean Data Network (AODN) +S, data_centre_email = info@aodn.org.au S, author_email = S, author = S, principal_investigator = S, principal_investigator_email = -S, institution_references = http://www.imos.org.au/emii.html +S, institution_references = http://www.imos.org.au/aodn.html % how S, lineage = Data were processed according to standard ANMN-NRS procedures before conversion to NetCDF. See link for details : http://help.aodn.org.au/help/sites/help.aodn.org.au/files/ANMN%20CTD%20Processing%20Procedures.pdf diff --git a/NetCDF/template/global_attributes_timeSeries.txt b/NetCDF/template/global_attributes_timeSeries.txt index b73adedb8..488ecddc3 100644 --- a/NetCDF/template/global_attributes_timeSeries.txt +++ b/NetCDF/template/global_attributes_timeSeries.txt @@ -64,13 +64,13 @@ D, time_coverage_start = D, time_coverage_end = % who -S, data_centre = eMarine Information Infrastructure (eMII) -S, data_centre_email = info@emii.org.au +S, data_centre = Australian Ocean Data Network (AODN) +S, data_centre_email = info@aodn.org.au S, author_email = S, author = S, principal_investigator = S, principal_investigator_email = -S, institution_references = http://www.imos.org.au/emii.html +S, institution_references = http://www.imos.org.au/aodn.html % how S, lineage = diff --git a/NetCDF/templateType.m b/NetCDF/templateType.m index 75bc9f659..d6c8c9438 100644 --- a/NetCDF/templateType.m +++ b/NetCDF/templateType.m @@ -27,7 +27,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -39,7 +39,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/DR1050Parse.m b/Parser/DR1050Parse.m index 9387ef7bc..b6b4206e3 100644 --- a/Parser/DR1050Parse.m +++ b/Parser/DR1050Parse.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/ECOBB9Parse.m b/Parser/ECOBB9Parse.m index f0a34c88a..6ee75ef59 100644 --- a/Parser/ECOBB9Parse.m +++ b/Parser/ECOBB9Parse.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/ECOTripletParse.m b/Parser/ECOTripletParse.m index c9f002fe4..4f064a270 100644 --- a/Parser/ECOTripletParse.m +++ b/Parser/ECOTripletParse.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/NIWAParse.m b/Parser/NIWAParse.m index bc1271dd5..2110c4622 100644 --- a/Parser/NIWAParse.m +++ b/Parser/NIWAParse.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/NXICBinaryParse.m b/Parser/NXICBinaryParse.m index deb966cda..510d5cd42 100644 --- a/Parser/NXICBinaryParse.m +++ b/Parser/NXICBinaryParse.m @@ -32,7 +32,7 @@ % % Guillaume Galibert % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -44,7 +44,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -670,11 +670,16 @@ [~, usort]=unique(reftimes, 'last'); isample=isample(usort); +% we only want to read full scans +isFullScan = isample+len-1 <= rdatlen; +isample(~isFullScan) = []; + % map data to uniform grid each row contains data channel, each column is a % observation. D=uint8(zeros(len,length(isample))); + for i=1:len; - D(i,:)=msamples.Data(isample+i-1); + D(i,:) = msamples.Data(isample+i-1); end time1 = D(1:4,:); t1 = bytecast(time1(:), 'L', 'uint32', cpuEndianness); diff --git a/Parser/SBE19Parse.m b/Parser/SBE19Parse.m index 6a3994a07..0fe3e0ade 100644 --- a/Parser/SBE19Parse.m +++ b/Parser/SBE19Parse.m @@ -30,7 +30,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -42,7 +42,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -102,7 +102,7 @@ end % read in the raw instrument header - instHeader = parseInstrumentHeader(instHeaderLines); + instHeader = parseInstrumentHeader(instHeaderLines, mode); procHeader = parseProcessedHeader( procHeaderLines); % use the appropriate subfunction to read in the data @@ -390,12 +390,13 @@ end end -function header = parseInstrumentHeader(headerLines) +function header = parseInstrumentHeader(headerLines, mode) %PARSEINSTRUMENTHEADER Parses the header lines from a SBE19/37 .cnv file. % Returns the header information in a struct. % % Inputs: % headerLines - cell array of strings, the lines of the header section. +% mode - Toolbox data type mode. % % Outputs: % header - struct containing information that was in the header @@ -429,7 +430,7 @@ %Replaced castExpr to be specific to NSW-IMOS PH NRT %Note: also replace definitions below in 'case 9' %BDM 24/01/2011 -castExpr2 ='Cast Time = (\w+ \d+ \d+ \d+:\d+:\d+)'; +castExpr2 = 'Cast Time = (\w+ \d+ \d+ \d+:\d+:\d+)'; intervalExpr = 'interval = (.*): ([\d\.\+)$'; sbe38Expr = 'SBE 38 = (yes|no), Gas Tension Device = (yes|no)'; optodeExpr = 'OPTODE = (yes|no)'; @@ -527,18 +528,22 @@ % cast case 14 - if isfield(header, 'castStart') - header.castNumber(end+1) = str2double(tkns{1}{1}); - header.castDate(end+1) = datenum( tkns{1}{2}, 'dd mmm yyyy HH:MM:SS'); - header.castStart(end+1) = str2double(tkns{1}{3}); - header.castEnd(end+1) = str2double(tkns{1}{4}); - header.castAvg(end+1) = str2double(tkns{1}{5}); - else + if ~isfield(header, 'castStart') header.castNumber = str2double(tkns{1}{1}); header.castDate = datenum( tkns{1}{2}, 'dd mmm yyyy HH:MM:SS'); header.castStart = str2double(tkns{1}{3}); header.castEnd = str2double(tkns{1}{4}); header.castAvg = str2double(tkns{1}{5}); + else + % in timeSeries mode we only need the first occurence + % but in profile mode we require all cast dates + if strcmpi(mode, 'profile') + header.castNumber(end+1) = str2double(tkns{1}{1}); + header.castDate(end+1) = datenum( tkns{1}{2}, 'dd mmm yyyy HH:MM:SS'); + header.castStart(end+1) = str2double(tkns{1}{3}); + header.castEnd(end+1) = str2double(tkns{1}{4}); + header.castAvg(end+1) = str2double(tkns{1}{5}); + end end % cast2 diff --git a/Parser/SBE37Parse.m b/Parser/SBE37Parse.m index 2929562a9..5bf2b6f22 100644 --- a/Parser/SBE37Parse.m +++ b/Parser/SBE37Parse.m @@ -23,7 +23,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -35,7 +35,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/SBE37SMParse.m b/Parser/SBE37SMParse.m index 831b30780..b17914aba 100644 --- a/Parser/SBE37SMParse.m +++ b/Parser/SBE37SMParse.m @@ -30,7 +30,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -42,7 +42,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/SBE39Parse.m b/Parser/SBE39Parse.m index 5eb16f13b..0d9671521 100644 --- a/Parser/SBE39Parse.m +++ b/Parser/SBE39Parse.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/SBE3x.m b/Parser/SBE3x.m index 6bb701c6f..df60440b2 100644 --- a/Parser/SBE3x.m +++ b/Parser/SBE3x.m @@ -92,7 +92,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -104,7 +104,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/SBE56Parse.m b/Parser/SBE56Parse.m index cf7b05e52..2956ff947 100644 --- a/Parser/SBE56Parse.m +++ b/Parser/SBE56Parse.m @@ -28,7 +28,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -40,7 +40,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/StarmonMiniParse.m b/Parser/StarmonMiniParse.m index 58a1f18e3..dcf431c84 100644 --- a/Parser/StarmonMiniParse.m +++ b/Parser/StarmonMiniParse.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -417,7 +417,7 @@ otherwise fprintf('%s\n', ['Warning : ' header.param(i).column ' not supported' ... - ' in ' filename '. Contact eMII.']); + ' in ' filename '. Contact AODN.']); end end diff --git a/Parser/VemcoParse.m b/Parser/VemcoParse.m index 3c1e7f1c0..b4ba0c8fd 100644 --- a/Parser/VemcoParse.m +++ b/Parser/VemcoParse.m @@ -26,7 +26,7 @@ % Contributor: Guillaume Galibert % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -38,7 +38,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/WQMParse.m b/Parser/WQMParse.m index 4c5479463..1b6d89c4f 100644 --- a/Parser/WQMParse.m +++ b/Parser/WQMParse.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/WetStarParse.m b/Parser/WetStarParse.m index a50e1e9c4..2d40f73af 100644 --- a/Parser/WetStarParse.m +++ b/Parser/WetStarParse.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/XRParse.m b/Parser/XRParse.m index 72603dd78..d06b18490 100644 --- a/Parser/XRParse.m +++ b/Parser/XRParse.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2010, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/YSI6SeriesParse.m b/Parser/YSI6SeriesParse.m index 28fbd56a5..eb2360d0a 100644 --- a/Parser/YSI6SeriesParse.m +++ b/Parser/YSI6SeriesParse.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/aquadoppProfilerParse.m b/Parser/aquadoppProfilerParse.m index e3b8a6bc4..3bafdbeb6 100644 --- a/Parser/aquadoppProfilerParse.m +++ b/Parser/aquadoppProfilerParse.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/aquadoppVelocityParse.m b/Parser/aquadoppVelocityParse.m index 9d9dd087f..54755e414 100644 --- a/Parser/aquadoppVelocityParse.m +++ b/Parser/aquadoppVelocityParse.m @@ -15,7 +15,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/aquatecParse.m b/Parser/aquatecParse.m index ea1f3838b..5e4ed597d 100644 --- a/Parser/aquatecParse.m +++ b/Parser/aquatecParse.m @@ -36,7 +36,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -48,7 +48,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/awacParse.m b/Parser/awacParse.m index 36974ca05..f2ac5ed33 100644 --- a/Parser/awacParse.m +++ b/Parser/awacParse.m @@ -28,7 +28,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -40,7 +40,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/continentalParse.m b/Parser/continentalParse.m index cf7b50145..441719aed 100644 --- a/Parser/continentalParse.m +++ b/Parser/continentalParse.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/convertECOrawVar.m b/Parser/convertECOrawVar.m index 65b77055c..e11809f6f 100644 --- a/Parser/convertECOrawVar.m +++ b/Parser/convertECOrawVar.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/convertSBEcnvVar.m b/Parser/convertSBEcnvVar.m index 07adbf8df..2753cbd0f 100644 --- a/Parser/convertSBEcnvVar.m +++ b/Parser/convertSBEcnvVar.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/echoviewParse.m b/Parser/echoviewParse.m index c05d341bb..f76f327fd 100644 --- a/Parser/echoviewParse.m +++ b/Parser/echoviewParse.m @@ -33,7 +33,7 @@ % Copyright (c) 2010, CSIRO. % This source is based on and uses code fragments from code that is: % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -45,7 +45,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/getParser.m b/Parser/getParser.m index 2bf7a1880..fdb984d71 100644 --- a/Parser/getParser.m +++ b/Parser/getParser.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/getParserNameForInstrument.m b/Parser/getParserNameForInstrument.m index 5ff4d5c14..d9cb77c37 100644 --- a/Parser/getParserNameForInstrument.m +++ b/Parser/getParserNameForInstrument.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/infinitySDLoggerParse.m b/Parser/infinitySDLoggerParse.m index bc60a6d9b..a8f894806 100644 --- a/Parser/infinitySDLoggerParse.m +++ b/Parser/infinitySDLoggerParse.m @@ -12,7 +12,7 @@ % Author : Guillaume Galibert % -% Copyright (c) 2010, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -24,7 +24,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/listParsers.m b/Parser/listParsers.m index 9e4f81457..3da4edd58 100644 --- a/Parser/listParsers.m +++ b/Parser/listParsers.m @@ -11,7 +11,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -23,7 +23,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/netcdfParse.m b/Parser/netcdfParse.m index 8660d4b28..3fb32f37a 100644 --- a/Parser/netcdfParse.m +++ b/Parser/netcdfParse.m @@ -16,7 +16,7 @@ % Gordon Keith % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -223,6 +223,10 @@ sample_data.meta.beam_angle = sample_data.instrument_beam_angle; end + if isfield(sample_data, 'instrument_nominal_depth') + sample_data.meta.depth = sample_data.instrument_nominal_depth; + end + if isfield(sample_data, 'instrument_sample_interval') sample_data.meta.instrument_sample_interval = sample_data.instrument_sample_interval; end @@ -231,6 +235,10 @@ sample_data.meta.featureType = sample_data.featureType; end + if isfield(sample_data, 'quality_control_log') + sample_data.meta.log = sample_data.quality_control_log; + end + iHeightAboveSensor = getVar(sample_data.dimensions, 'HEIGHT_ABOVE_SENSOR'); if iHeightAboveSensor sample_data.meta.binSize = diff(sample_data.dimensions{iHeightAboveSensor}.data(1:2)); diff --git a/Parser/readAD2CPBinary.m b/Parser/readAD2CPBinary.m index f35e7de0c..0dca0599b 100644 --- a/Parser/readAD2CPBinary.m +++ b/Parser/readAD2CPBinary.m @@ -24,7 +24,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -36,7 +36,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readAWACWaveAscii.m b/Parser/readAWACWaveAscii.m index 337a4913b..ffde1f7cc 100644 --- a/Parser/readAWACWaveAscii.m +++ b/Parser/readAWACWaveAscii.m @@ -116,7 +116,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -128,7 +128,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readBB9raw.m b/Parser/readBB9raw.m index 414bdfd8f..b705a75d8 100644 --- a/Parser/readBB9raw.m +++ b/Parser/readBB9raw.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readECODevice.m b/Parser/readECODevice.m index 6bfc238ab..72c19f63f 100644 --- a/Parser/readECODevice.m +++ b/Parser/readECODevice.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readECOraw.m b/Parser/readECOraw.m index 6b924cc51..b90e44dcd 100644 --- a/Parser/readECOraw.m +++ b/Parser/readECOraw.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readNetCDFAtts.m b/Parser/readNetCDFAtts.m index 9ddf06e53..1e1cf6b68 100644 --- a/Parser/readNetCDFAtts.m +++ b/Parser/readNetCDFAtts.m @@ -15,7 +15,7 @@ % Contributor : Guillaume Galibert % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readNetCDFVar.m b/Parser/readNetCDFVar.m index a43b79454..7ee8dcf13 100644 --- a/Parser/readNetCDFVar.m +++ b/Parser/readNetCDFVar.m @@ -16,7 +16,7 @@ % Gordon Keith % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readParadoppBinary.m b/Parser/readParadoppBinary.m index a1de63dc0..ca5870d9b 100644 --- a/Parser/readParadoppBinary.m +++ b/Parser/readParadoppBinary.m @@ -36,7 +36,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -48,7 +48,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readSBE19cnv.m b/Parser/readSBE19cnv.m index cf8bd5169..f625a3834 100644 --- a/Parser/readSBE19cnv.m +++ b/Parser/readSBE19cnv.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readSBE19hex.m b/Parser/readSBE19hex.m index 99b6e3457..6ba4cb30b 100644 --- a/Parser/readSBE19hex.m +++ b/Parser/readSBE19hex.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readSBE37cnv.m b/Parser/readSBE37cnv.m index 35f342ab8..3deebec1b 100644 --- a/Parser/readSBE37cnv.m +++ b/Parser/readSBE37cnv.m @@ -20,7 +20,7 @@ % Guillaume Galibert % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readSBE37hex.m b/Parser/readSBE37hex.m index 218b3ea49..cd8b630e7 100644 --- a/Parser/readSBE37hex.m +++ b/Parser/readSBE37hex.m @@ -15,7 +15,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readVemcoCsv.m b/Parser/readVemcoCsv.m index aea1aa945..8ea421882 100644 --- a/Parser/readVemcoCsv.m +++ b/Parser/readVemcoCsv.m @@ -17,7 +17,7 @@ % Contributor: Guillaume Galibert % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readWQMdat.m b/Parser/readWQMdat.m index 860c8d617..ac3531482 100644 --- a/Parser/readWQMdat.m +++ b/Parser/readWQMdat.m @@ -77,7 +77,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -89,7 +89,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readWQMraw.m b/Parser/readWQMraw.m index f7f6fb34a..46d8a187d 100644 --- a/Parser/readWQMraw.m +++ b/Parser/readWQMraw.m @@ -39,7 +39,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -51,7 +51,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readWetStarraw.m b/Parser/readWetStarraw.m index c7c93ac0f..27692ad1b 100644 --- a/Parser/readWetStarraw.m +++ b/Parser/readWetStarraw.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readWorkhorseEnsembles.m b/Parser/readWorkhorseEnsembles.m index c82533c74..b2442a096 100644 --- a/Parser/readWorkhorseEnsembles.m +++ b/Parser/readWorkhorseEnsembles.m @@ -42,7 +42,7 @@ % Guillaume Galibert % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -54,7 +54,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readWorkhorseWaveAscii.m b/Parser/readWorkhorseWaveAscii.m index 2572d8c3d..1df2cdb9b 100644 --- a/Parser/readWorkhorseWaveAscii.m +++ b/Parser/readWorkhorseWaveAscii.m @@ -31,7 +31,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -43,7 +43,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readXR420.m b/Parser/readXR420.m index 805c0305e..b4b0b8f06 100644 --- a/Parser/readXR420.m +++ b/Parser/readXR420.m @@ -17,7 +17,7 @@ % Contributor : Guillaume Galibert % -% Copyright (c) 2010, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/readXR620.m b/Parser/readXR620.m index c82471642..d185a2cfa 100644 --- a/Parser/readXR620.m +++ b/Parser/readXR620.m @@ -18,7 +18,7 @@ % Author : Guillaume Galibert % -% Copyright (c) 2010, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -514,7 +514,7 @@ data.(fields{k}) = data.(fields{k})/10; %Temperature (Celsius degree) - case 'Temp', name = 'TEMP'; + case {'Temp', 'temp02'}, name = 'TEMP'; %Pressure (dBar) case {'Pres', 'pres08'}, name = 'PRES'; @@ -836,12 +836,11 @@ data = struct; % get the column names - header.variables = strrep(header.variables, ' & ', '|'); - header.variables = strrep(header.variables, ' ', '|'); - while ~strcmpi(header.variables, strrep(header.variables, '||', '|')) - header.variables = strrep(header.variables, '||', '|'); - end - cols = textscan(header.variables, '%s', 'Delimiter', '|'); + % replace ' & ' or ' ' delimited variable names with a '|' delimiter + header.variables = regexprep(header.variables, '(\s+\&\s+|\s+)', '|'); + cols = textscan(header.variables, '%s', ... + 'Delimiter', '|', ... + 'MultipleDelimsAsOne', true); % header.variables might start by a delimiter cols = cols{1}; % rename variables with '-', ' ', '&', '(', ')' as Matlab doesn't allow @@ -856,7 +855,7 @@ fmt = '%s %s'; % figure out number of columns from the number of channels - fmt = [fmt repmat(' %f', [1, length(cols)-1])]; + fmt = [fmt repmat(' %f', [1, length(cols)-2])]; % read in the sample data samples = textscan(fid, fmt, 'treatAsEmpty', {'null'}); diff --git a/Parser/sensusUltraParse.m b/Parser/sensusUltraParse.m index a5700c7e1..69f3548d7 100644 --- a/Parser/sensusUltraParse.m +++ b/Parser/sensusUltraParse.m @@ -12,7 +12,7 @@ % Author : Guillaume Galibert % -% Copyright (c) 2010, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -24,7 +24,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/setParserNameForInstrument.m b/Parser/setParserNameForInstrument.m index 53310806b..708c6da75 100644 --- a/Parser/setParserNameForInstrument.m +++ b/Parser/setParserNameForInstrument.m @@ -18,7 +18,7 @@ function setParserNameForInstrument( make, model, parser ) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ function setParserNameForInstrument( make, model, parser ) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/signatureParse.m b/Parser/signatureParse.m index 528bc5dd3..6840a6f00 100644 --- a/Parser/signatureParse.m +++ b/Parser/signatureParse.m @@ -15,7 +15,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Parser/workhorseParse.m b/Parser/workhorseParse.m index 36c7b6cdc..bdc762c05 100644 --- a/Parser/workhorseParse.m +++ b/Parser/workhorseParse.m @@ -35,7 +35,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -47,7 +47,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/CTDDepthBinPP.m b/Preprocessing/CTDDepthBinPP.m index 7ceb38420..84ccc5365 100644 --- a/Preprocessing/CTDDepthBinPP.m +++ b/Preprocessing/CTDDepthBinPP.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/Transform/listTransformations.m b/Preprocessing/Transform/listTransformations.m index d2a12a0ba..6235312ac 100644 --- a/Preprocessing/Transform/listTransformations.m +++ b/Preprocessing/Transform/listTransformations.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/Transform/sbe43OxygenTransform.m b/Preprocessing/Transform/sbe43OxygenTransform.m index 2f08cd6c6..1f6172237 100644 --- a/Preprocessing/Transform/sbe43OxygenTransform.m +++ b/Preprocessing/Transform/sbe43OxygenTransform.m @@ -26,7 +26,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -38,7 +38,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/absiDecibelBasicPP.m b/Preprocessing/absiDecibelBasicPP.m index d3c8673a6..740f66c14 100644 --- a/Preprocessing/absiDecibelBasicPP.m +++ b/Preprocessing/absiDecibelBasicPP.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/adcpBinMappingPP.m b/Preprocessing/adcpBinMappingPP.m index 3a35368e8..f61687d0a 100644 --- a/Preprocessing/adcpBinMappingPP.m +++ b/Preprocessing/adcpBinMappingPP.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/adcpNortekVelocityBeam2EnuPP.m b/Preprocessing/adcpNortekVelocityBeam2EnuPP.m index 8876cc236..936a43a94 100644 --- a/Preprocessing/adcpNortekVelocityBeam2EnuPP.m +++ b/Preprocessing/adcpNortekVelocityBeam2EnuPP.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/adcpNortekVelocityEnu2BeamPP.m b/Preprocessing/adcpNortekVelocityEnu2BeamPP.m index ed2b9bf06..caf71cdce 100644 --- a/Preprocessing/adcpNortekVelocityEnu2BeamPP.m +++ b/Preprocessing/adcpNortekVelocityEnu2BeamPP.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/aquatrackaPP.m b/Preprocessing/aquatrackaPP.m index b74f0325a..3ba0e0aea 100644 --- a/Preprocessing/aquatrackaPP.m +++ b/Preprocessing/aquatrackaPP.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/depthPP.m b/Preprocessing/depthPP.m index 1b746a0d3..d6d76ff65 100644 --- a/Preprocessing/depthPP.m +++ b/Preprocessing/depthPP.m @@ -26,7 +26,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -38,7 +38,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/listPreprocessRoutines.m b/Preprocessing/listPreprocessRoutines.m index 5ce622563..d3700bc41 100644 --- a/Preprocessing/listPreprocessRoutines.m +++ b/Preprocessing/listPreprocessRoutines.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/magneticDeclinationPP.m b/Preprocessing/magneticDeclinationPP.m index f395957ad..d15e829f8 100644 --- a/Preprocessing/magneticDeclinationPP.m +++ b/Preprocessing/magneticDeclinationPP.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/pressureRelPP.m b/Preprocessing/pressureRelPP.m index 4b34cd2bb..0b04e6bc5 100644 --- a/Preprocessing/pressureRelPP.m +++ b/Preprocessing/pressureRelPP.m @@ -15,7 +15,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/rinkoDoPP.m b/Preprocessing/rinkoDoPP.m index 540349d4d..f79d271a2 100644 --- a/Preprocessing/rinkoDoPP.m +++ b/Preprocessing/rinkoDoPP.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/salinityPP.m b/Preprocessing/salinityPP.m index 99e72ea63..d204178d6 100644 --- a/Preprocessing/salinityPP.m +++ b/Preprocessing/salinityPP.m @@ -23,7 +23,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -35,7 +35,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/soakStatusPP.m b/Preprocessing/soakStatusPP.m index 6002168bf..911facbd4 100644 --- a/Preprocessing/soakStatusPP.m +++ b/Preprocessing/soakStatusPP.m @@ -30,7 +30,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -42,7 +42,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/timeDriftPP.m b/Preprocessing/timeDriftPP.m index 560d45237..8dded0b03 100644 --- a/Preprocessing/timeDriftPP.m +++ b/Preprocessing/timeDriftPP.m @@ -29,7 +29,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -41,7 +41,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/timeMetaOffsetPP.m b/Preprocessing/timeMetaOffsetPP.m index 3f5573be6..8e1c874ea 100644 --- a/Preprocessing/timeMetaOffsetPP.m +++ b/Preprocessing/timeMetaOffsetPP.m @@ -26,7 +26,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -38,7 +38,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/timeOffsetPP.m b/Preprocessing/timeOffsetPP.m index 4cdcc8718..84a345359 100644 --- a/Preprocessing/timeOffsetPP.m +++ b/Preprocessing/timeOffsetPP.m @@ -28,7 +28,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -40,7 +40,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/timeStartPP.m b/Preprocessing/timeStartPP.m index 4b7a3d5d2..ec266cd9d 100644 --- a/Preprocessing/timeStartPP.m +++ b/Preprocessing/timeStartPP.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/transformPP.m b/Preprocessing/transformPP.m index eb958fbbd..09cf08a78 100644 --- a/Preprocessing/transformPP.m +++ b/Preprocessing/transformPP.m @@ -39,7 +39,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -51,7 +51,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Preprocessing/variableOffsetPP.m b/Preprocessing/variableOffsetPP.m index e4c3f1e95..40bf0d215 100644 --- a/Preprocessing/variableOffsetPP.m +++ b/Preprocessing/variableOffsetPP.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/O2sol.m b/Util/O2sol.m index efad76c19..b3a0d56fb 100644 --- a/Util/O2sol.m +++ b/Util/O2sol.m @@ -23,7 +23,7 @@ % Contributor : Guillaume Galibert % -% Copyright (c) 2010, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -35,7 +35,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/WGS84reckon.m b/Util/WGS84reckon.m index c2861d3ec..6939c454e 100644 --- a/Util/WGS84reckon.m +++ b/Util/WGS84reckon.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/addDim.m b/Util/addDim.m index aac8ba1dc..6970fbcf3 100644 --- a/Util/addDim.m +++ b/Util/addDim.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/addVar.m b/Util/addVar.m index 638d37c70..165e82fd8 100644 --- a/Util/addVar.m +++ b/Util/addVar.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/bytecast.m b/Util/bytecast.m index 4707e5824..2e565e03d 100644 --- a/Util/bytecast.m +++ b/Util/bytecast.m @@ -19,7 +19,7 @@ % computers % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/cellCons.m b/Util/cellCons.m index 6c5a7d218..bd917f7be 100644 --- a/Util/cellCons.m +++ b/Util/cellCons.m @@ -14,7 +14,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -26,7 +26,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/cellStructCons.m b/Util/cellStructCons.m index 27509621d..3f76df4a6 100644 --- a/Util/cellStructCons.m +++ b/Util/cellStructCons.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/delProperty.m b/Util/delProperty.m index 19bb03ce6..af7b2ab89 100644 --- a/Util/delProperty.m +++ b/Util/delProperty.m @@ -22,7 +22,7 @@ function delProperty( prop, file, delim ) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ function delProperty( prop, file, delim ) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/fsearch.m b/Util/fsearch.m index 60e038428..88ab3c31b 100644 --- a/Util/fsearch.m +++ b/Util/fsearch.m @@ -28,7 +28,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -40,7 +40,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/fsearchRegexp.m b/Util/fsearchRegexp.m index 626fa055f..1f86327d9 100644 --- a/Util/fsearchRegexp.m +++ b/Util/fsearchRegexp.m @@ -26,7 +26,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -38,7 +38,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/genSampleDataDesc.m b/Util/genSampleDataDesc.m index 3200d9a9c..7369faf50 100644 --- a/Util/genSampleDataDesc.m +++ b/Util/genSampleDataDesc.m @@ -15,7 +15,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -27,7 +27,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/getCTDs.m b/Util/getCTDs.m index 0996450a0..cb4540049 100644 --- a/Util/getCTDs.m +++ b/Util/getCTDs.m @@ -21,7 +21,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -33,7 +33,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/getDeployments.m b/Util/getDeployments.m index cd8ddd2d1..8b716b21f 100644 --- a/Util/getDeployments.m +++ b/Util/getDeployments.m @@ -22,7 +22,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -34,7 +34,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/getErrorString.m b/Util/getErrorString.m index 756e3a921..5c3135612 100644 --- a/Util/getErrorString.m +++ b/Util/getErrorString.m @@ -13,7 +13,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -25,7 +25,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/getVar.m b/Util/getVar.m index 94b4fe078..6fb20b3a5 100644 --- a/Util/getVar.m +++ b/Util/getVar.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/imosCompile.m b/Util/imosCompile.m index 5cb2b2b78..3cbecf99d 100644 --- a/Util/imosCompile.m +++ b/Util/imosCompile.m @@ -25,7 +25,7 @@ function imosCompile() % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -37,7 +37,7 @@ function imosCompile() % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/imosPackage.m b/Util/imosPackage.m index 261885cb3..aa4d91473 100644 --- a/Util/imosPackage.m +++ b/Util/imosPackage.m @@ -34,7 +34,7 @@ function imosPackage() % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -46,7 +46,7 @@ function imosPackage() % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/listFiles.m b/Util/listFiles.m index 1db8b8789..5b56717ce 100644 --- a/Util/listFiles.m +++ b/Util/listFiles.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/listProperties.m b/Util/listProperties.m index 6ee5398cf..0310ec9c9 100644 --- a/Util/listProperties.m +++ b/Util/listProperties.m @@ -24,7 +24,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -36,7 +36,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/netcdf3ToMatlabType.m b/Util/netcdf3ToMatlabType.m index ede6c1be8..b5b35e0a9 100644 --- a/Util/netcdf3ToMatlabType.m +++ b/Util/netcdf3ToMatlabType.m @@ -20,7 +20,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -32,7 +32,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/parseAttributeValue.m b/Util/parseAttributeValue.m index b6c9f96e5..dbaa34937 100644 --- a/Util/parseAttributeValue.m +++ b/Util/parseAttributeValue.m @@ -19,7 +19,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -31,7 +31,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/plotclr.m b/Util/plotclr.m index ef503137f..9813d66c7 100644 --- a/Util/plotclr.m +++ b/Util/plotclr.m @@ -81,7 +81,7 @@ end htmp = plot(hAx, x(iv), y(iv), marker, ... 'Color', map(nc,:), ... - 'MarkerSize', sqrt(5), varargin{:}); + varargin{:}); if ~isempty(htmp), h = htmp; end @@ -95,7 +95,7 @@ end htmp = plot(hAx, x(iv), y(iv), marker, ... 'Color', map(nc,:), ... - 'MarkerSize', sqrt(5), varargin{:}); + varargin{:}); if ~isempty(htmp), h = htmp; end end diff --git a/Util/populateMetadata.m b/Util/populateMetadata.m index 98ee3b48d..c92dd6913 100644 --- a/Util/populateMetadata.m +++ b/Util/populateMetadata.m @@ -16,7 +16,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -28,7 +28,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/posUi2.m b/Util/posUi2.m index e4abec7b7..2e0d02ab0 100644 --- a/Util/posUi2.m +++ b/Util/posUi2.m @@ -33,7 +33,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -45,7 +45,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/r_b.m b/Util/r_b.m index 4be4fcd97..328de109f 100644 --- a/Util/r_b.m +++ b/Util/r_b.m @@ -13,7 +13,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -25,7 +25,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/readProperty.m b/Util/readProperty.m index 0b5ccb119..aaf2ec7cb 100644 --- a/Util/readProperty.m +++ b/Util/readProperty.m @@ -25,7 +25,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -37,7 +37,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/rkbwr.m b/Util/rkbwr.m index 96f72d892..c4bcfb748 100644 --- a/Util/rkbwr.m +++ b/Util/rkbwr.m @@ -10,7 +10,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -22,7 +22,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/saveGraph.m b/Util/saveGraph.m index 3475feb4f..f97a58391 100644 --- a/Util/saveGraph.m +++ b/Util/saveGraph.m @@ -11,7 +11,7 @@ % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -23,7 +23,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/updateIf.m b/Util/updateIf.m index 265ce1324..56447545d 100644 --- a/Util/updateIf.m +++ b/Util/updateIf.m @@ -17,7 +17,7 @@ % % -% Copyright (c) 2011, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -29,7 +29,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/updateIfEmpty.m b/Util/updateIfEmpty.m index 521987b56..441fb5b8a 100644 --- a/Util/updateIfEmpty.m +++ b/Util/updateIfEmpty.m @@ -18,7 +18,7 @@ % % -% Copyright (c) 2011, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/Util/writeProperty.m b/Util/writeProperty.m index 598a527eb..e1fe576da 100644 --- a/Util/writeProperty.m +++ b/Util/writeProperty.m @@ -28,7 +28,7 @@ function writeProperty( prop, val, file, delim ) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -40,7 +40,7 @@ function writeProperty( prop, val, file, delim ) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % diff --git a/imosToolbox.m b/imosToolbox.m index 3a9fd5dc4..70ee2f423 100644 --- a/imosToolbox.m +++ b/imosToolbox.m @@ -18,7 +18,7 @@ function imosToolbox(auto, varargin) % % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -30,7 +30,7 @@ function imosToolbox(auto, varargin) % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. % @@ -73,7 +73,7 @@ function imosToolbox(auto, varargin) end % Set current toolbox version -toolboxVersion = ['2.5.13 - ' computer]; +toolboxVersion = ['2.5.14 - ' computer]; switch auto case 'auto', autoIMOSToolbox(toolboxVersion, varargin{:}); diff --git a/imosToolbox_Linux64.bin b/imosToolbox_Linux64.bin index 077c9c38c..ce6af4aac 100755 Binary files a/imosToolbox_Linux64.bin and b/imosToolbox_Linux64.bin differ diff --git a/imosToolbox_Win32.exe b/imosToolbox_Win32.exe index 4ce5a1695..a0986df93 100644 Binary files a/imosToolbox_Win32.exe and b/imosToolbox_Win32.exe differ diff --git a/imosToolbox_Win64.exe b/imosToolbox_Win64.exe index c5a0072c0..3e83759f8 100644 Binary files a/imosToolbox_Win64.exe and b/imosToolbox_Win64.exe differ diff --git a/license.txt b/license.txt index ec0aa4d7d..7dcbc7ef3 100644 --- a/license.txt +++ b/license.txt @@ -1,5 +1,5 @@ % -% Copyright (c) 2009, eMarine Information Infrastructure (eMII) and Integrated +% Copyright (c) 2016, Australian Ocean Data Network (AODN) and Integrated % Marine Observing System (IMOS). % All rights reserved. % @@ -11,7 +11,7 @@ % * Redistributions in binary form must reproduce the above copyright % notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% * Neither the name of the eMII/IMOS nor the names of its contributors +% * Neither the name of the AODN/IMOS nor the names of its contributors % may be used to endorse or promote products derived from this software % without specific prior written permission. %