diff --git a/isis/src/apollo/apps/apollo2isis/main.cpp b/isis/src/apollo/apps/apollo2isis/main.cpp
index 2b078f0f9575e68579b8b89e90b455e6678eac4b..a16e686da12e997d16153a83fc90a997f53c3d55 100644
--- a/isis/src/apollo/apps/apollo2isis/main.cpp
+++ b/isis/src/apollo/apps/apollo2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "Chip.h"
 #include "UserInterface.h"
@@ -49,11 +57,11 @@ void IsisMain() {
 
   QString filename = FileName(ui.GetFileName("FROM")).baseName();
   FileName toFile = ui.GetFileName("TO");
-  
+
   apollo = new Apollo(filename);
 
-  utcTime = (QString)pdsLabel["START_TIME"];  
-  
+  utcTime = (QString)pdsLabel["START_TIME"];
+
   // Setup the output cube attributes for a 16-bit unsigned tiff
   Isis::CubeAttributeOutput cao;
   cao.setPixelType(Isis::Real);
@@ -64,11 +72,11 @@ void IsisMain() {
   p.EndProcess();
 
   cube.open(toFile.expanded(), "rw");
-  
+
   // Once the image is imported, we need to find and decrypt the code
   if (apollo->IsMetric() && FindCode())
     TranslateCode();
-    
+
   CalculateTransform();
   // Once we have decrypted the code, we need to populate the image labels
   TranslateApolloLabels(filename, &cube);
@@ -88,7 +96,7 @@ bool FindCode() {
   for (int i=1; i<chip.Samples()-6*RADIUS-1; i+=RADIUS/8) {
     for (int j=1; j<=chip.Lines()-4*RADIUS-1; j+=RADIUS/8) {
       if ( chip.GetValue(i,j) > 60000 && chip.GetValue(i+2*RADIUS, j) > 60000 &&
-                  chip.GetValue(i+2*RADIUS, j+2*RADIUS) < 60000 && 
+                  chip.GetValue(i+2*RADIUS, j+2*RADIUS) < 60000 &&
                   chip.GetValue(i+2*RADIUS, j+4*RADIUS) > 60000)  {
         // Now that we've found one, let's refine the location
         codeFound = true;
@@ -99,7 +107,7 @@ bool FindCode() {
       }
     }
   }
-  
+
   // If the code was not found, we will use the default location
   codeFound = false;
   codeSample = CENTER_SAMPLE;
@@ -119,7 +127,7 @@ void CalculateTransform() {
       sampleUR, lineUR,
       sampleLL, lineLL,
       sampleLR, lineLR;
-      
+
   RefineCodeLocation();
   sampleUL = codeSample;
   lineUL = codeLine;
@@ -135,7 +143,7 @@ void CalculateTransform() {
   RefineCodeLocation();
   sampleLL = codeSample;
   lineLL = codeLine;
-  
+
   if (code[0][0] == 1 && code[0][31] ==1 && code[3][0] == 1 && code[3][31] == 1) {
   rotation = -1*atan((sampleLR-sampleUR+sampleLL-sampleUL)/(lineLR-lineUR+lineLL-lineUL)) - 0.00281891751001 - 0.000648055741779;
   sampleTranslation = (sampleUL+sampleUR+sampleLL+sampleLR)/4;
@@ -151,7 +159,7 @@ void CalculateTransform() {
           sampleTranslation = 600;
           lineTranslation = 22700;
   }
-  
+
   if (apollo->IsApollo17())
           rotation += 0.0111002410269388;
 }
@@ -207,7 +215,7 @@ void TranslateCode() {
       else code[i][31-j] = false;
     }
   }
-  
+
   for (int j=0; j<32; j++) {
     for (int i=0; i<4; i++) {
     }
@@ -222,11 +230,11 @@ void TranslateApolloLabels (IString filename, Cube *opack) {
   PvlGroup inst("Instrument");
   PvlGroup kern("Kernels");
   PvlGroup codeGroup("Code");
-  
+
   inst += PvlKeyword("SpacecraftName", apollo->SpacecraftName());
   inst += PvlKeyword("InstrumentId", apollo->InstrumentId());
   inst += PvlKeyword("TargetName", apollo->TargetName());
-  
+
   if ( !IsValidCode() ){
     PvlGroup error("ERROR");
     error.addComment("The decrypted code is invalid.");
@@ -243,12 +251,12 @@ void TranslateApolloLabels (IString filename, Cube *opack) {
   else {
     codeGroup += PvlKeyword("StartTime", FrameTime());
     codeGroup += PvlKeyword("SpacecraftAltitude", toString(Altitude()),"meters");
-  
+
     if (apollo->IsMetric()){
       codeGroup += PvlKeyword("ExposureDuration", toString(ShutterInterval()), "milliseconds");
       codeGroup += PvlKeyword("ForwardMotionCompensation", FMC());
     }
-    
+
     for (int i=0; i<4; i++) {
       PvlKeyword keyword("Column"+toString(i+1));
       for (int j=0; j<32; j++) {
@@ -257,13 +265,13 @@ void TranslateApolloLabels (IString filename, Cube *opack) {
       codeGroup += keyword;
     }
   }
-    
+
   PvlGroup bandBin("BandBin");
   // There are no filters on the camera, so the default is clear with id # of 1
   // the BandBin group is only included to work with the spiceinit application
   bandBin += PvlKeyword("FilterName", "CLEAR");
   bandBin += PvlKeyword("FilterId", "1");
-  
+
   kern += PvlKeyword("NaifFrameCode", apollo->NaifFrameCode());
 
   // Set up the nominal reseaus group
@@ -273,24 +281,24 @@ void TranslateApolloLabels (IString filename, Cube *opack) {
   QString missionDir = dataDir[tTable.Translate("MissionName", apollo->SpacecraftName())][0];
   Pvl resTemplate(missionDir + "/reseaus/" + apollo->InstrumentId() + "_NOMINAL.pvl");
   PvlGroup *reseaus = &resTemplate.findGroup("Reseaus");
-  
+
   // Update reseau locations based on refined code location
   for (int i=0; i<(reseaus->findKeyword("Type")).size(); i++) {
     double x = toDouble(reseaus->findKeyword("Sample")[i]) + sampleTranslation + 2278,
            y = toDouble(reseaus->findKeyword("Line")[i]) + lineTranslation - 20231;
-    
+
     if (apollo->IsApollo17()) {
         x += 50;
         y += 20;
     }
-    
+
     reseaus->findKeyword("Sample")[i] = toString(
         cos(rotation)*(x-sampleTranslation) - sin(rotation)*(y-lineTranslation) + sampleTranslation);
     reseaus->findKeyword("Line")[i] = toString(
         sin(rotation)*(x-sampleTranslation) + cos(rotation)*(y-lineTranslation) + lineTranslation);
   }
   inst += PvlKeyword("StartTime", utcTime);
-    
+
   opack->putGroup(inst);
   opack->putGroup(bandBin);
   opack->putGroup(kern);
@@ -303,7 +311,7 @@ bool IsValidCode() {
   return codeFound && ( code[0][0] || !code[0][3] || !code[0][5] || code[0][10] ||  !code[0][11] || !code[0][12] || code[0][15] || !code[0][16] || code[0][21] || !code[0][22] || !code[0][26] || code[0][31] ||
                          code[1][0] || !code[1][6] || !code[1][11] || code[1][12] || !code[1][13] || !code[1][14] || code[1][15] || !code[1][28] || code[1][29] || !code[1][30] || code[1][31] ||
                          code[2][0] || code[2][15] || !code[2][21] || code[2][22] || !code[2][23] || !code[2][24] || !code[2][25] || !code[2][26] || !code[2][27] || !code[2][28] || !code[2][29] || !code[2][30] || code[2][31] )
-                   && (!(apollo->IsMetric()) || (code[3][0] || !code[3][13] || !code[3][14] || code[3][15] || !code[3][16] || !code[3][17] || !code[3][18] || !code[3][19] || !code[3][20] || !code[3][21] || 
+                   && (!(apollo->IsMetric()) || (code[3][0] || !code[3][13] || !code[3][14] || code[3][15] || !code[3][16] || !code[3][17] || !code[3][18] || !code[3][19] || !code[3][20] || !code[3][21] ||
                                                    !code[3][22] || !code[3][23] || !code[3][24] || !code[3][25] || !code[3][26] || !code[3][27] || !code[3][28] || !code[3][30] || code[3][31]));
 }
 
@@ -319,29 +327,29 @@ QString FrameTime() {
       if (i<4) days += (int)pow(2.0, i)*code[0][9-i];
       else days += 10*(int)pow(2.0, i-4)*code[0][8-i];
     }
-    
+
     for (int i=0; i<6; i++) {
       if (i<4) hours += (int)pow(2.0, i)*code[0][20-i];
       else hours += 10*(int)pow(2.0, i-4)*code[0][18-i];
     }
-    
+
     for (int i=0; i<7; i++) {
       if (i<4) minutes += (int)pow(2.0, i)*code[0][30-i];
       else minutes += 10*(int)pow(2.0, i-4)*code[0][29-i];
     }
-    
+
     for (int i=0; i<7; i++) {
       if (i<4) seconds += (int)pow(2.0, i)*code[1][10-i];
       else seconds += 10*(int)pow(2.0, i-4)*code[1][9-i];
     }
-    
+
     // And the milliseconds
     for (int i=0; i<12; i++) {
       if (i<4) seconds += 0.001* pow(2.0, i)*code[1][27-i];
       else if (i<8) seconds += 0.01*pow(2.0, i-4)*code[1][27-i];
       else seconds += 0.1*pow(2.0, i-8)*code[1][27-i];
     }
-    
+
     // Perform checks to make sure the time is correct
     //   (i.e. convert 60 seconds to a minute, etc.)
     if (seconds > 60) {
@@ -358,11 +366,11 @@ QString FrameTime() {
     }
     // This last check will only affect Apollo 15 which launched in July (31 days) and landed in August
     // Both Apollo 16 and Apollo 17 launched and landed in the same month
-    if (days > 31){ 
+    if (days > 31){
       days -= 31;
       month += 1;
     }
-  
+
     QString sTime = toString(year) + "-";
     if (month < 10) sTime += "0";
     sTime += toString(month)+ "-";
@@ -374,7 +382,7 @@ QString FrameTime() {
     sTime += toString(minutes) + ":";
     if (seconds <10) sTime += "0";
     sTime += toString(seconds);
-    
+
     return sTime;
 }
 
diff --git a/isis/src/apollo/apps/apollocal/apollocal.cpp b/isis/src/apollo/apps/apollocal/apollocal.cpp
index cecdf18b33389692b1c4ecf37d3a5169a7cc8940..5d42998a6a19c0a784181c6cd1915ecf5f30ec01 100644
--- a/isis/src/apollo/apps/apollocal/apollocal.cpp
+++ b/isis/src/apollo/apps/apollocal/apollocal.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CubeAttribute.h"
 #include "ProcessByTile.h"
 #include "Pvl.h"
@@ -11,23 +19,23 @@ using namespace std;
 
 
 namespace Isis {
-  void cal(vector<Buffer *> &in, 
+  void cal(vector<Buffer *> &in,
          vector<Buffer *> &out);
 
-  
+
   void apollocal(UserInterface &ui) {
     Cube cube(ui.GetFileName("FROM"), "r");
     apollocal(&cube, ui);
   }
-  
-  
+
+
   void apollocal(Cube *inCube, UserInterface &ui) {
     // We will be processing by line
     ProcessByTile p;
     p.SetTileSize(128, 128);
-  
+
     p.SetInputCube(inCube);
-  
+
     PvlGroup &dataDir =
         Preference::Preferences().findGroup("DataDirectory");
     PvlTranslationTable tTable("$ISISROOT/appdata/translations/MissionName2DataDir.trn");
@@ -35,17 +43,17 @@ namespace Isis {
         (inCube->group("Instrument")).findKeyword("SpacecraftName")[0])][0];
     QString camera =
         (inCube->group("Instrument")).findKeyword("InstrumentId")[0];
-  
+
     CubeAttributeInput cai;
     p.SetInputCube(missionDir + "/calibration/" + camera + "_flatfield.cub", cai);
-  
+
     CubeAttributeOutput cao;
     cao.setPixelType(Real);
     p.SetOutputCube(
         FileName(ui.GetAsString("TO")).expanded(),
         cao, inCube->sampleCount(), inCube->lineCount(),
         inCube->bandCount());
-  
+
     p.StartProcess(cal);
     p.EndProcess();
   }
@@ -55,8 +63,8 @@ namespace Isis {
     Buffer &inp = *in[0];      // Input Cube
     Buffer &fff = *in[1];      // Flat Field File
     Buffer &outp = *out[0];    // Output Cube
-  
-    
+
+
     // Loop for each pixel in the line.
     for (int i=0; i<inp.size(); i++) {
       if (IsSpecial(inp[i])) {
@@ -73,4 +81,4 @@ namespace Isis {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/isis/src/apollo/apps/apollocal/apollocal.h b/isis/src/apollo/apps/apollocal/apollocal.h
index 41825c838a87679e434ccf810e3ee167d6e78687..12a47471824e150303d4b619cd56b49bdddeef2a 100644
--- a/isis/src/apollo/apps/apollocal/apollocal.h
+++ b/isis/src/apollo/apps/apollocal/apollocal.h
@@ -1,6 +1,14 @@
-#ifndef apollocal_h // Change this to your app name in all lower case suffixed with _h (e.g. campt_h, cam2map_h etc.)
+#ifndef apollocal_h
 #define apollocal_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "UserInterface.h"
 
@@ -9,4 +17,4 @@ namespace Isis{
   extern void apollocal(UserInterface &ui);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/isis/src/apollo/apps/apollocal/main.cpp b/isis/src/apollo/apps/apollocal/main.cpp
index 437f3461ccdeb12ad5c398d0cd4c9ae3628f1b5c..15d1da3effea9ecf7ad579860814c6f8805a8a3a 100644
--- a/isis/src/apollo/apps/apollocal/main.cpp
+++ b/isis/src/apollo/apps/apollocal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
@@ -8,4 +16,4 @@ using namespace Isis;
 void IsisMain() {
   UserInterface &ui = Application::GetUserInterface();
   apollocal(ui);
-}
\ No newline at end of file
+}
diff --git a/isis/src/apollo/apps/apollofindrx/apollofindrx.cpp b/isis/src/apollo/apps/apollofindrx/apollofindrx.cpp
index 0cd32b225c941c17c57bf575b958ef212f6646e6..c933e58e835ce795823804ed4c188352d7ad363c 100644
--- a/isis/src/apollo/apps/apollofindrx/apollofindrx.cpp
+++ b/isis/src/apollo/apps/apollofindrx/apollofindrx.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "PvlGroup.h"
 #include "UserInterface.h"
 #include "Cube.h"
@@ -192,7 +200,7 @@ namespace Isis {
                 fitChip.SetValue(s, l, fit);
             }
         }
-        
+
         if (bestFit == Isis::Null || bestFit > tolerance) return false;
 
         GoodnessOfFit = bestFit;
diff --git a/isis/src/apollo/apps/apollofindrx/apollofindrx.h b/isis/src/apollo/apps/apollofindrx/apollofindrx.h
index b0973b08b3ecc1a7be64dcca94a727ae6d76eb9d..04c9efecb1e3e44c3fb23ca24c0ba60b9d5ace7a 100644
--- a/isis/src/apollo/apps/apollofindrx/apollofindrx.h
+++ b/isis/src/apollo/apps/apollofindrx/apollofindrx.h
@@ -1,6 +1,14 @@
-#ifndef apollofindrx_h 
+#ifndef apollofindrx_h
 #define apollofindrx_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/apollo/apps/apollofindrx/main.cpp b/isis/src/apollo/apps/apollofindrx/main.cpp
index 967510cae48ac166810a04c8fb257a98adca8886..fb4383c50d024e13c76c192fe15475733af7d2f0 100644
--- a/isis/src/apollo/apps/apollofindrx/main.cpp
+++ b/isis/src/apollo/apps/apollofindrx/main.cpp
@@ -1,7 +1,15 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
-#include "apollofindrx.h" 
+#include "apollofindrx.h"
 
 using namespace Isis;
 
diff --git a/isis/src/apollo/apps/apollopaninit/main.cpp b/isis/src/apollo/apps/apollopaninit/main.cpp
index c2a8de8faa1658059876877bf2f9eea0e406c895..fc347871f9f68f635b76ca9fafecf39db96f467d 100644
--- a/isis/src/apollo/apps/apollopaninit/main.cpp
+++ b/isis/src/apollo/apps/apollopaninit/main.cpp
@@ -1,21 +1,10 @@
-/**
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 
 //Isis.h and IsisDebug.h if needed
diff --git a/isis/src/apollo/apps/apollopanstitcher/Trans2d3p.h b/isis/src/apollo/apps/apollopanstitcher/Trans2d3p.h
index 4b6bcbfe9708d3eae9c08d1b0c837b14aa946318..d569d589eed5ad8299d3e331118732fe894e3956 100644
--- a/isis/src/apollo/apps/apollopanstitcher/Trans2d3p.h
+++ b/isis/src/apollo/apps/apollopanstitcher/Trans2d3p.h
@@ -1,34 +1,18 @@
 #ifndef trans2d3p_h
 #define trans2d3p_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "Transform.h"
 #include <math.h>
 
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2005/10/03 22:43:39 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
-
-
 using namespace Isis;
 
 /**
diff --git a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp
index 97b5809a13b81bf3bdebcbd940990249a6e97c4f..a8a9a8df3079a689a7f46cbe8da229907ea38bae 100644
--- a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp
+++ b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 /*
 Program uses the fiducial marks along the edges of Apollo Panoramic Images to stich eight sub-scans into a single conitinuous image
 
diff --git a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.h b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.h
index 4e6bb91107e5442ad8abd5edc0fedce0609033e4..df8793c244ef8ed950fbbbec219e3ecd94503272 100644
--- a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.h
+++ b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.h
@@ -1,6 +1,14 @@
 #ifndef apollopanstitcher_h
 #define apollopanstitcher_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Pvl.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/apollo/apps/apollopanstitcher/main.cpp b/isis/src/apollo/apps/apollopanstitcher/main.cpp
index cbf3b429b357cae88bd6b18bc9bf2e263636a184..7ce76f222756f8573db2b6e94f8762a8683bce1e 100644
--- a/isis/src/apollo/apps/apollopanstitcher/main.cpp
+++ b/isis/src/apollo/apps/apollopanstitcher/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "apollopanstitcher.h"
diff --git a/isis/src/apollo/apps/apolloremrx/main.cpp b/isis/src/apollo/apps/apolloremrx/main.cpp
index 96f55c82216767cfc8eaef8c82add67948369a9a..4391b0d766b443b60ee0968a825eab8df8c6c083 100644
--- a/isis/src/apollo/apps/apolloremrx/main.cpp
+++ b/isis/src/apollo/apps/apolloremrx/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByTile.h"
 #include "SpecialPixel.h"
diff --git a/isis/src/apollo/apps/apollowarp/WarpTransform.cpp b/isis/src/apollo/apps/apollowarp/WarpTransform.cpp
index a7c8a5ac70770aa7ec5f4dd1091422b66956cf78..27d1e548be489156d4cb2a3e8b1bf4944c1f8c0c 100644
--- a/isis/src/apollo/apps/apollowarp/WarpTransform.cpp
+++ b/isis/src/apollo/apps/apollowarp/WarpTransform.cpp
@@ -1,18 +1,26 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <iostream>
 
 #include "WarpTransform.h"
 
 namespace Isis {
-  WarpTransform::WarpTransform(BasisFunction &basisLine, 
-       BasisFunction &basisSamp, bool weighted, std::vector<double> &inputLine, 
+  WarpTransform::WarpTransform(BasisFunction &basisLine,
+       BasisFunction &basisSamp, bool weighted, std::vector<double> &inputLine,
        std::vector<double> &inputSample, std::vector<double> &outputLine,
-       std::vector<double> &outputSample, int inputLines, int inputSamples, 
+       std::vector<double> &outputSample, int inputLines, int inputSamples,
        int outputLines, int outputSamples) {
-       
+
     p_outputLines = outputLines;
     p_outputSamples = outputSamples;
-  
+
     // Create the equations for the control points using a least squares fit
     p_lsqInputSamp = new LeastSquares(basisSamp);
     p_lsqInputLine = new LeastSquares(basisLine);
@@ -24,23 +32,23 @@ namespace Isis {
       p_lsqInputLine->AddKnown(known,inputLine[i]);
       p_lsqInputSamp->AddKnown(known,inputSample[i]);
     }
-  
+
     p_lsqInputLine->Solve();
     p_lsqInputSamp->Solve();
-  
+
     p_weighted = weighted;
     if (weighted) {
       p_outputLine = outputLine;
       p_outputSample = outputSample;
     }
   }
-  
+
   WarpTransform::~WarpTransform() {
     if (p_lsqInputLine != NULL) delete p_lsqInputLine;
     if (p_lsqInputSamp != NULL) delete p_lsqInputSamp;
   }
-  
-   
+
+
   // Convert the requested output samp/line to an input samp/line
   bool WarpTransform::Xform (double &inSample, double &inLine,
                         const double outSample, const double outLine) {
@@ -59,7 +67,7 @@ namespace Isis {
       p_lsqInputLine->Solve();
       p_lsqInputSamp->Solve();
     }
-  
+
     static std::vector<double> vars;
     if (vars.size() != 2) vars.resize(2);
     vars[0] = outLine;
@@ -68,7 +76,7 @@ namespace Isis {
     inSample = p_lsqInputSamp->Evaluate(vars);
     return true;
   }
-  
+
   PvlGroup WarpTransform::Residuals () {
     PvlGroup errs("Residuals");
     for (int i=0; i<p_lsqInputLine->Knowns(); i++) {
diff --git a/isis/src/apollo/apps/apollowarp/WarpTransform.h b/isis/src/apollo/apps/apollowarp/WarpTransform.h
index 00d976dd1e624490823348ada0d694c8d2f58d2e..75bcdba5f57f96ea45844d8d113d3e58c8bbca04 100644
--- a/isis/src/apollo/apps/apollowarp/WarpTransform.h
+++ b/isis/src/apollo/apps/apollowarp/WarpTransform.h
@@ -1,6 +1,14 @@
 #ifndef WarpTransform_h
 #define WarpTransform_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <vector>
 #include "Transform.h"
 #include "BasisFunction.h"
@@ -16,26 +24,26 @@ namespace Isis {
  */
 class WarpTransform : public Transform {
     public:
-      WarpTransform(Isis::BasisFunction &basisLine, 
+      WarpTransform(Isis::BasisFunction &basisLine,
            Isis::BasisFunction &basisSamp, bool weighted,
            std::vector<double> &inputLine, std::vector<double> &inputSample,
            std::vector<double> &outputLine, std::vector<double> &outputSample,
            int inputLines, int inputSamples, int outputLines, int outputSamples);
       ~WarpTransform();
-  
+
       // Implementations for parent's pure virtual members
       bool Xform (double &inSample, double &inLine,
                       const double outSample, const double outLine);
       int OutputSamples () const { return p_outputSamples; };
       int OutputLines () const { return p_outputLines; };
       Isis::PvlGroup Residuals();
-  
+
     private:
       int p_outputSamples;
       int p_outputLines;
       Isis::LeastSquares *p_lsqInputLine;
       Isis::LeastSquares *p_lsqInputSamp;
-  
+
       std::vector<double> p_outputLine;
       std::vector<double> p_outputSample;
       bool p_weighted;
@@ -43,5 +51,3 @@ class WarpTransform : public Transform {
 
 }
 #endif
-
-
diff --git a/isis/src/apollo/apps/apollowarp/main.cpp b/isis/src/apollo/apps/apollowarp/main.cpp
index c8a0850bce72a11cac6693cf36d918ae9776afd1..a554a26757c1d37498efbf6cb97223bf91d73a47 100644
--- a/isis/src/apollo/apps/apollowarp/main.cpp
+++ b/isis/src/apollo/apps/apollowarp/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include <fstream>
 #include <iostream>
diff --git a/isis/src/apollo/objs/Apollo/Apollo.h b/isis/src/apollo/objs/Apollo/Apollo.h
index f4bf45856f2618b9aac82bffaedc712544c4dfc3..d5e6c11c64f75816f5916ca21d82b925dd5341b5 100644
--- a/isis/src/apollo/objs/Apollo/Apollo.h
+++ b/isis/src/apollo/objs/Apollo/Apollo.h
@@ -1,28 +1,13 @@
 #ifndef Apollo_h
 #define Apollo_h
 
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2005/10/03 22:43:39 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "iTime.h"
 #include "IString.h"
@@ -46,23 +31,23 @@ namespace Isis {
 
       /**
        * Constructor. Calls initialize() to set variables based on the QStrings passed in.
-       * 
+       *
        * @param spacecraft The name of the spacecraft
        * @param instrument The name of the instrument
-       * 
+       *
        * @see initialize(QString spacecraft, QString instrument)
        */
       Apollo (QString spacecraft, QString instrument) {
         initialize(spacecraft.toUpper(), instrument.toUpper());
       };
 
-      
+
       /**
        * Constructor. Parses the filename passed in and sets the spacecraft name and instrument.
        * Calls initialize() to set variables based on the spacecraft and instrument.
-       * 
+       *
        * @param filename The image filename that will be parsed to get the spacecraft and instrument
-       * 
+       *
        * @see initialize(QString spacecraft, QString instrument)
        */
       Apollo(QString filename) {
@@ -88,154 +73,154 @@ namespace Isis {
         initialize(spacecraft, instrument);
       };
 
-      
+
       //! Destroys the Apollo object
       ~Apollo () {};
 
       /**
        * Checks if the instrument is an Apollo Metric camera.
-       * 
+       *
        * @return bool True if the instrument is Metric
        */
       bool IsMetric () {return p_instrumentId == "METRIC";}
-      
-      
+
+
       /**
        * Checks if the instrument is an Apollo Panoramic camera.
-       * 
+       *
        * @return bool True if the instrument is Panoramic
        */
       bool IsPanoramic () {return p_instrumentId == "PANORAMIC";}
-      
-      
+
+
       /**
        * Checks if the instrument is an Apollo Hasselblad camera.
-       * 
+       *
        * @return bool True if the instrument is Hasselblad
        */
       bool IsHasselblad () {return p_instrumentId == "HASSELBLAD";}
-      
-      
+
+
       /**
        * Checks if the spacecraft is Apollo 15
-       * 
+       *
        * @return bool True if the spacecraft is Apollo 15
        */
       bool IsApollo15 () {return p_spacecraftName == "APOLLO 15";}
-      
-      
+
+
       /**
        * Checks if the spacecraft is Apollo 16
-       * 
+       *
        * @return bool True if the spacecraft is Apollo 16
        */
       bool IsApollo16 () {return p_spacecraftName == "APOLLO 16";}
-      
-      
+
+
       /**
        * Checks if the spacecraft is Apollo 17
-       * 
+       *
        * @return bool True if the spacecraft is Apollo 17
        */
       bool IsApollo17 () {return p_spacecraftName == "APOLLO 17";}
-      
-      
+
+
       /**
-       * Returns the width of the image. The image width is set in initialize() based on the 
+       * Returns the width of the image. The image width is set in initialize() based on the
        * instrument.
-       * 
+       *
        * @see initialize(QString spacecraft, QString instrument)
-       * 
+       *
        * @return int Width of the image.
        */
       int Width () {return p_imageWidth;};
-      
-      
+
+
       /**
-       * Returns the height of the image. The image height is set in initialize() based on the 
+       * Returns the height of the image. The image height is set in initialize() based on the
        * instrument.
-       * 
+       *
        * @see initialize(QString spacecraft, QString instrument)
-       * 
+       *
        * @return int Height of the image.
        */
       int Height () {return p_imageHeight;};
-      
-      
+
+
       /**
-       * Returns number of bands in the image. The number of bands is set in initialize() based on  
+       * Returns number of bands in the image. The number of bands is set in initialize() based on
        * the instrument.
-       * 
+       *
        * @see initialize(QString spacecraft, QString instrument)
-       * 
+       *
        * @return int Bands of the image.
        */
       int Bands () { return p_imageBands;};
-      
-      
+
+
       /**
-       * Returns the reseau dimension of the image. The reseau dimenstion is set in initialize() 
+       * Returns the reseau dimension of the image. The reseau dimenstion is set in initialize()
        * based on the instrument.
-       * 
+       *
        * @see initialize(QString spacecraft, QString instrument)
-       * 
+       *
        * @return int Reseau dimension of the image.
        */
       int ReseauDimension () {return p_reseauDimension;};
-      
-      
+
+
       /**
-       * Returns pixel pitch for the image. The pixel patch is set in initialize() based on  
-       * the instrument. 
-       * 
+       * Returns pixel pitch for the image. The pixel patch is set in initialize() based on
+       * the instrument.
+       *
        * @see initialize(QString spacecraft, QString instrument)
-       * 
+       *
        * @return double Pixel pitch of the image.
        */
       double PixelPitch () {return p_imagePixelPitch;};
-      
-      
+
+
       /**
        * Returns the spacecraft name.
-       * 
+       *
        * @return QString Spacecraft name.
        */
       QString SpacecraftName () {return p_spacecraftName;};
-      
-      
+
+
       /**
        * Returns the instrument ID.
-       * 
+       *
        * @return QString Instrument ID.
        */
       QString InstrumentId () {return p_instrumentId;};
-      
-      
+
+
       /**
-       * Returns the NAIF frame code. The NAIF frame code is set in initialize() based on  the 
-       * spacecraft and instrument. 
-       * 
+       * Returns the NAIF frame code. The NAIF frame code is set in initialize() based on  the
+       * spacecraft and instrument.
+       *
        * @see initialize(QString spacecraft, QString instrument)
-       * 
+       *
        * @return QString NAIF frame code of the image.
        */
       QString NaifFrameCode () {return p_naifFrameCode;};
-      
-      
+
+
       /**
        * Returns the target name which is always the Moon.
-       * 
+       *
        * @return QString Moon.
        */
       QString TargetName () {return "MOON";};
-      
-      
+
+
       /**
-       * Returns the launch date of the mission. The launch date is set in initialize() based on the 
+       * Returns the launch date of the mission. The launch date is set in initialize() based on the
        * spacecraft and instrument.
-       * 
+       *
        * @see initialize(QString spacecraft, QString instrument)
-       * 
+       *
        * @return QString Launch date of mission
        */
       iTime LaunchDate () {return p_launchDate;};
@@ -244,13 +229,13 @@ namespace Isis {
 
       /**
        * Sets variables based on the spacecraft name and instrument.
-       * 
+       *
        * @param spacecraft Spacecraft name
        * @param instrument Instrument ID
-       * 
+       *
        * @throws IException::Unknown "Unknown instrument"
        * @throws IException::Unknown "Unknown spacecraft"
-       * 
+       *
        * @return void
        */
       void initialize(QString spacecraft, QString instrument) {
@@ -310,7 +295,7 @@ namespace Isis {
         }
       }
 
-      
+
       int p_imageWidth;           //!< Image width
       int p_imageHeight;          //!< Image height
       int p_imageBands;           //!< Number of bands in the image
diff --git a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp
index 5f9b8d1617dbd7b50068c5bd6b08ed4608b9a566..287846f475c365f0ec8111cf9ae68028fa94ba9c 100644
--- a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp
+++ b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp
@@ -1,21 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
  */
 #include "ApolloMetricCamera.h"
 
@@ -49,7 +38,7 @@ namespace Isis {
    */
   ApolloMetricCamera::ApolloMetricCamera(Cube &cube) : FramingCamera(cube) {
     NaifStatus::CheckErrors();
-    
+
     m_instrumentNameLong = "Metric Camera";
     m_instrumentNameShort = "Metric";
 
@@ -89,7 +78,7 @@ namespace Isis {
       QString msg = "File does not appear to be an Apollo image";
       throw IException(IException::User, msg, _FILEINFO_);
     }
-    
+
     // Get the camera characteristics
     SetFocalLength();
     SetPixelPitch();
@@ -122,7 +111,7 @@ namespace Isis {
     NaifStatus::CheckErrors();
   }
 
-  
+
   /**
    * Returns the shutter open and close times. The user should pass in the
    * exposure duration in seconds and the StartTime keyword value, converted to
diff --git a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.h b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.h
index c0051d6f81d77ce55dbefd0f5b32bd1b6b8f8af4..dcf66cb1f11634e3b7f57b5a68e754590d946e16 100644
--- a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.h
+++ b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.h
@@ -1,23 +1,13 @@
 #ifndef ApolloMetricCamera_h
 #define ApolloMetricCamera_h
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -47,7 +37,7 @@ namespace Isis {
    *                           Updated documentation. Removed Apollo namespace
    *                           wrap inside Isis namespace. Added Isis Disclaimer
    *                           to files.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards.   References #972.
    *   @history 2014-01-17 Kris Becker - Set CkReferenceID to J2000 to resolve
    *                           problem with ckwriter. Also, set the SpkReferenceId
@@ -55,7 +45,7 @@ namespace Isis {
    *   @history 2015-08-24 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods and added test data for Apollo 16 and 17.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    *   @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807.
@@ -65,16 +55,16 @@ namespace Isis {
       ApolloMetricCamera(Cube &cube);
       //! Destroys the ApolloMetricCamera Object
       ~ApolloMetricCamera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
       /**
        * CK frame ID -
        * Apollo 15 instrument code (A15_METRIC) = -915240
        * Apollo 16 instrument code (A16_METRIC) = -916240
-       * Apollo 17 instrument code (A17_METRIC) = -917240 
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       * Apollo 17 instrument code (A17_METRIC) = -917240
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return p_ckFrameId; }
@@ -84,8 +74,8 @@ namespace Isis {
        * APOLLO_15_NADIR = 1
        * APOLLO_16_NADIR = 1
        * APOLLO_17_NADIR = 1
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" Kernel 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix" Kernel
        *         Reference ID
        */
       virtual int CkReferenceId() const { return p_ckReferenceId; }
@@ -94,21 +84,21 @@ namespace Isis {
        * SPK Target Body ID -
        * Apollo 15 = -915
        * Apollo 16 = -916
-       * Apollo 17 = -917 
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       * Apollo 17 = -917
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Target ID
        */
       virtual int SpkTargetId() const { return p_spkTargetId; }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
+       *
        *  Even thought the ephemeris is relative to B1950, this specification
        *  is for writing SPK kernels.  We should stay with the J2000 epoch in
        *  these cases.
        *
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID,
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.cpp b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.cpp
index da6a44c4456c8c7543e2e131940bff51942bce08..f10be468fb7005021878356a030ece8b9bc2dd72 100644
--- a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.cpp
+++ b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.cpp
@@ -1,21 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
  */
 #include "ApolloMetricDistortionMap.h"
 #include "CameraFocalPlaneMap.h"
@@ -23,9 +12,9 @@
 using namespace std;
 namespace Isis {
   /**
-   *  
-   * Constructs a Distortion Map object for the Apollo Metric Camera. 
-   *  
+   *
+   * Constructs a Distortion Map object for the Apollo Metric Camera.
+   *
    * @param parent Pointer to parent Camera object
    * @param xp Pricipal point x-coordinate
    * @param yp Pricipal point y-coordinate
@@ -35,7 +24,7 @@ namespace Isis {
    * @param j1 First coefficient of decentering distortion
    * @param j2 Second coefficient of decentering distortion
    * @param t0 Angle between positive x-axis of image and vector to imaged point
-   * 
+   *
    * @internal
    *   @history 2011-05-03 Jeannie Walldren - Added documentation.
    *   @history 2013-03-18 Debbie A. Cook - Added flag to flip focal plane z axis
diff --git a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.h b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.h
index 545b18e3e7a4983f2a532feff27148f43414c4c2..f379e641cfcb258fb0489792a0a940037efb8d42 100644
--- a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.h
+++ b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.h
@@ -1,22 +1,13 @@
 #ifndef ApolloMetricDistortionMap_h
 #define ApolloMetricDistortionMap_h
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
  */
 #include "CameraDistortionMap.h"
 #include "Camera.h"
@@ -37,9 +28,9 @@ namespace Isis {
   class ApolloMetricDistortionMap : public CameraDistortionMap {
     public:
       /**
-       *  
-       * Constructs a Distortion Map object for the Apollo Metric Camera. 
-       *  
+       *
+       * Constructs a Distortion Map object for the Apollo Metric Camera.
+       *
        * @param parent Pointer to parent Camera object
        * @param xp Pricipal point x-coordinate
        * @param yp Pricipal point y-coordinate
@@ -49,20 +40,20 @@ namespace Isis {
        * @param j1 First coefficient of decentering distortion
        * @param j2 Second coefficient of decentering distortion
        * @param t0 Angle between positive x-axis of image and vector to imaged point
-       * 
+       *
        * @internal
        *   @history 2011-05-03 Jeannie Walldren - Added documentation.
        *   @history 2013-03-18 Debbie A. Cook - Added flag to flip focal plane z axis
        */
-      ApolloMetricDistortionMap(Camera *parent, double xp, double yp, 
-                                double k1, double k2, double k3, double j1, 
+      ApolloMetricDistortionMap(Camera *parent, double xp, double yp,
+                                double k1, double k2, double k3, double j1,
                                 double j2, double t0);
-      
-      
+
+
       //! Destroys ApolloMetricDistortionMap object.
       ~ApolloMetricDistortionMap() {};
-      
-      
+
+
       /**
        * Compute undistorted focal plane x/y
        *
@@ -76,8 +67,8 @@ namespace Isis {
        * @return whether the conversion was successful
        */
       bool SetFocalPlane(const double dx, const double dy);
-      
-      
+
+
       /**
        * Compute distorted focal plane x/y
        *
@@ -91,8 +82,8 @@ namespace Isis {
        * @return whether the conversion was successful
        */
       bool SetUndistortedFocalPlane(const double ux, const double uy);
-      
-    private:  
+
+    private:
       // parameters below are from camera calibration report
       double p_xp;  //!< Principal point x-coordinate.
       double p_yp;  //!< Principal point y-coordinate.
@@ -102,7 +93,7 @@ namespace Isis {
       double p_j1;  //!< First coefficient of decentering distortion.
       double p_j2;  //!< Second coefficient of decentering distortion.
       double p_t0;  /**< Angle between positive x-axis of image and vector to
-                          imaged point. Used in computation of decentering 
+                          imaged point. Used in computation of decentering
                           distortion.*/
   };
 };
diff --git a/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp b/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp
index 06350495d3bd2809f2864dc3da7a5d2c39fa8f5b..1e72c67d09ab1bf244322895247059ad85e4f0e8 100644
--- a/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp
+++ b/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iomanip>
 #include <iostream>
diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.cpp b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.cpp
index a5994816b8800bbd30824aaf3a4ef821e407e3c8..d2b83f07ccb34bc5ea71271c4142dd7a8b723c7b 100644
--- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.cpp
+++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ApolloPanIO.h"
 
 #include <math.h>
@@ -55,16 +63,16 @@ namespace Isis {
         obs[i].image[0] =  FIDS/2;
       else
         obs[i].image[0] = -FIDS/2;
-  
+
       obs[i].image[1] = (-21.5 + double(int(i/2)))*FIDL;
 
-      //adjustment to account for the half spacing among the 22nd, 23rd, and 24th 
+      //adjustment to account for the half spacing among the 22nd, 23rd, and 24th
       //  fiducials on each side
       if (int(i/2)==22)
         obs[i].image[1] -= FIDL/2;
       else if ( int(i/2) > 22)
         obs[i].image[1] -= FIDL;
-    
+
       obs[i].image[1] = -obs[i].image[1];  //sign reversal to match camera layout
     }
 
@@ -101,7 +109,7 @@ namespace Isis {
     if (fiducialNumber < 0 || fiducialNumber > 89)
       return -1;
 
-    //next check the range of the machine coordinates 
+    //next check the range of the machine coordinates
     // (this is just a nonsense number check)
     if (fabs(machineX) > 1e20)
       return -1;
@@ -142,13 +150,13 @@ namespace Isis {
   }
 
   /**
-   * This method leverages all the fiducial obersatvions to caculate a series of affine 
+   * This method leverages all the fiducial obersatvions to caculate a series of affine
    * transformations for cube (machine) space into image space.  The quality of solution
    * can be accessed using the residual stats accessors.
    *
    * @return 1  success
    * @return -1 failure, insufficient fiducial measurements
-   */ 
+   */
   int ApolloPanIO::computeInteriorOrienation()
   {
     int     i,j,k,l,m;  //indeces-counters for linear algebra computations
@@ -161,12 +169,12 @@ namespace Isis {
         cndot[43][4][12],
         cxstar[172],     //cX*  matrix, Uotila course notes page 122
         cnct[14878],     //CNCt matrix, Uotila course notes page 122
-        atw[44][6];      //right side of normal equation (see Uotila course notes) 
+        atw[44][6];      //right side of normal equation (see Uotila course notes)
                          // NOTE:  I store w with reversed signs compared to Uotila's notes
 
     double adot[2][6],wdot[2];
 
-    //adot is a sub matrix of A (see Uotila Course notes page 122).  
+    //adot is a sub matrix of A (see Uotila Course notes page 122).
     //  It is composed of partials WRT to unknowns.
     //some affine partials are the same for every point so might as well hard code them now...
     adot[0][2] = 0.0;
@@ -174,14 +182,14 @@ namespace Isis {
 
     adot[0][4] = 1.0;
     adot[0][5] = 0.0;
-  
+
     adot[1][0] = 0.0;
     adot[1][1] = 0.0;
 
     adot[1][4] = 0.0;
     adot[1][5] = 1.0;
 
-    //first order of business... 
+    //first order of business...
     // figure out how many affines there will be and which fiducial measures belong to each
 
     //the first affine always begins with point zero
@@ -191,7 +199,7 @@ namespace Isis {
     for (i=2, n=0;  i<90;  i+=2) {
       // i is counting the fiducials
       // n is counting the affines
-    
+
       //every time both fiducials in a horizontal (equal x coordinate) pair have been measured start
       //  a new affine
       if (obs[i].flag && obs[i+1].flag) {
@@ -208,7 +216,7 @@ namespace Isis {
     //now that we know how many affines will be needed we can get started
 
     //solve each affine individually
-  
+
     //for each affine
     for (i =0; i<n; i++) {
       //initialize the appropriate ndot and atw matrices
@@ -243,25 +251,25 @@ namespace Isis {
             atw[i][k] += adot[0][k]*wdot[0] + adot[1][k]*wdot[1];
         }
       }
-    
+
       //copy the atw matrix into the affine class structure so that it isn't lost when the solution
       // is done
       for (j=0; j<6; j++)
         affines[i].A2I[j] = atw[i][j];
 
       //solve this affine
-      //NOTE: it must also be inverted for later calculations, hence three instead of two for the 
+      //NOTE: it must also be inverted for later calculations, hence three instead of two for the
       //  last argument
-      if (!Isis::choleski_solve(ndot[i],affines[i].A2I,6,3))  
+      if (!Isis::choleski_solve(ndot[i],affines[i].A2I,6,3))
         j=0;
     }
-   
+
 
     //now the contributions of the continuity conditions must be added....
 
-     //cdot[i] are sub matrices of C matrix (Uotila page 122)  
+     //cdot[i] are sub matrices of C matrix (Uotila page 122)
      //Note: the cdot matrices are 4x12 (4 continuity conditions between 2 six paramter affines)
-     //  however the left 4x6 portion of the cdot matrix and right 4x6 portion are equal but 
+     //  however the left 4x6 portion of the cdot matrix and right 4x6 portion are equal but
      //  opposite so it's only necessary to calc/store one of them
     for (i=0; i<n-1; i++) {
       //build cdot matrix for continuity condition between affine i and i+1
@@ -284,15 +292,15 @@ namespace Isis {
       cdot[i][2][2 ] =  0.0;
       cdot[i][2][3 ] =  0.0;
       cdot[i][2][4 ] =  1.0;
-      cdot[i][2][5 ] =  0.0;    
+      cdot[i][2][5 ] =  0.0;
 
       cdot[i][3][0 ] =  0.0;
       cdot[i][3][1 ] =  0.0;
       cdot[i][3][2 ] =  obs[affines[i].indeces[1]  ].mach[0];
-      cdot[i][3][3 ] =  obs[affines[i].indeces[1]  ].mach[1];  
+      cdot[i][3][3 ] =  obs[affines[i].indeces[1]  ].mach[1];
       cdot[i][3][4 ] =  0.0;
-      cdot[i][3][5 ] =  1.0;  
-    }  
+      cdot[i][3][5 ] =  1.0;
+    }
 
     //calculate cndot sub matrices of Uotila's C(AtM-A)- page122
     for (i=0; i<n-1; i++) {
@@ -305,7 +313,7 @@ namespace Isis {
         for (k=0; k<6; k++)
           for (l=0; l<6; l++) {
             cndot[i][j][k  ] += cdot[i][j][l] * ndot[i  ][Isis::isymp(l,k)];
-            cndot[i][j][k+6] -= cdot[i][j][l] * ndot[i+1][Isis::isymp(l,k)];          
+            cndot[i][j][k+6] -= cdot[i][j][l] * ndot[i+1][Isis::isymp(l,k)];
           }
     }
 
@@ -343,18 +351,18 @@ namespace Isis {
         for (j=0; j<4; j++)
            for (k=0; k<4; k++)
               for (l=0; l<6; l++)
-                 cnct[Isis::isymp(j+i*4,k+4+i*4)] += cndot[i][j][l+6]*cdot[i+1][k][l];  
+                 cnct[Isis::isymp(j+i*4,k+4+i*4)] += cndot[i][j][l+6]*cdot[i+1][k][l];
      }
 
 
      Isis::choleski_solve(cnct,cxstar,4*(n-1),2);
 
      //cxstar are now Kc Lagrange multipliers
-     //now (CN)tKc = NCtKc are the secondary corrections to the unknowns and they can be added 
+     //now (CN)tKc = NCtKc are the secondary corrections to the unknowns and they can be added
      //  directly to the previously calculated values
 
      //corrections to the first affine
-     for (i=0; i<6; i++) {  
+     for (i=0; i<6; i++) {
         for (j=0; j<4;j ++)
            affines[0].A2I[i] += cxstar[j]*cndot[0][j][i];
      }
@@ -364,18 +372,18 @@ namespace Isis {
         for (j=0; j<6; j++) {
            for (k=0; k<4; k++)
               affines[i].A2I[j] += cxstar[(i-1)*4+k]*cndot[i-1][k][j+6];
-           for (k=0; k<4; k++)  
+           for (k=0; k<4; k++)
               affines[i].A2I[j] += cxstar[(i  )*4+k]*cndot[i  ][k][j  ];
         }
      }
 
      //corrections for the last affine
-     for (i=0; i<6; i++) {  
-        for (j=0; j<4; j++)  
+     for (i=0; i<6; i++) {
+        for (j=0; j<4; j++)
            affines[n-1].A2I[i] += cxstar[4*(n-2)+j]*cndot[n-2][j][i+6];
      }
 
-   
+
      //now compute the reverse affines
      for (i=0; i<n; i++) {
         det = affines[i].A2I[0]*affines[i].A2I[3] - affines[i].A2I[1]*affines[i].A2I[2];
@@ -386,18 +394,18 @@ namespace Isis {
         affines[i].A2M[1] = -affines[i].A2I[1]/det;
         affines[i].A2M[2] = -affines[i].A2I[2]/det;
 
-        affines[i].A2M[4] = - affines[i].A2M[0]*affines[i].A2I[4] 
+        affines[i].A2M[4] = - affines[i].A2M[0]*affines[i].A2I[4]
                             - affines[i].A2M[1]*affines[i].A2I[5];
-        affines[i].A2M[5] = - affines[i].A2M[2]*affines[i].A2I[4] 
-                            - affines[i].A2M[3]*affines[i].A2I[5];  
+        affines[i].A2M[5] = - affines[i].A2M[2]*affines[i].A2I[4]
+                            - affines[i].A2M[3]*affines[i].A2I[5];
      }
 
-     //now define the rotation coefficients that will transform any image/machine y coordinate into 
-     //  a reference frame where the two right most fiducials are have the exact same y value and 
+     //now define the rotation coefficients that will transform any image/machine y coordinate into
+     //  a reference frame where the two right most fiducials are have the exact same y value and
      //  it is thus easy to determine where a point lies on the left side of the line
 
      double pt1[2], pt2[2],v[2];
-   
+
      for (i=0; i<n; i++) {
         //rotations in machine space,
 
@@ -407,58 +415,58 @@ namespace Isis {
         pt1[1] = obs[affines[i].indeces[1]-1].mach[1];
 
         pt2[0] = obs[affines[i].indeces[1]  ].mach[0];
-        pt2[1] = obs[affines[i].indeces[1]  ].mach[1];  
+        pt2[1] = obs[affines[i].indeces[1]  ].mach[1];
+
 
-      
         //find the point on the line closest to the origin
 
         //vector in the direction of a line
         v[0] = pt1[0] - pt2[0];
-        v[1] = pt1[1] - pt2[1];  
-      
+        v[1] = pt1[1] - pt2[1];
+
         //using det as the scale factor along the line from pt1 to the point nearest the origin
         det = -(pt1[0]*v[0] + pt1[1]*v[1])/(v[0]*v[0]+v[1]*v[1]);
 
-        //pt1 + det*v is the point closest to the origin and the angle needed to rotate that 
+        //pt1 + det*v is the point closest to the origin and the angle needed to rotate that
         //  point so that it lies on the y axis is...
         angle = atan2((pt1[0]+det*v[0]),(pt1[1]+det*v[1]));
 
-        //and since we're only ever going to be concerned with rotating the y coordinates and z's 
-        //  are alwyas zero there are only two values we need to save to elements of the rotation 
+        //and since we're only ever going to be concerned with rotating the y coordinates and z's
+        //  are alwyas zero there are only two values we need to save to elements of the rotation
         //  matrix
         affines[i].rotM[0] =  sin(angle);
-        affines[i].rotM[1] =  cos(angle);  
+        affines[i].rotM[1] =  cos(angle);
 
-        //any machine coordinate [u,v] can be rotated into a system where the greatest y values of 
-        // the fiducial marks are the same, and therefore the greatest y value in a particular 
+        //any machine coordinate [u,v] can be rotated into a system where the greatest y values of
+        // the fiducial marks are the same, and therefore the greatest y value in a particular
         // affine is:
         affines[i].mM = pt1[0]*affines[i].rotM[0] + pt1[1]*affines[i].rotM[1];
 
         //or equivalently...
         //affines[i].mM = pt2[0]*affines[i].rotM[0] + pt2[1]*affines[i].rotM[1];
 
-     
+
 
         //rotations in image space
-      
-        //for this calculation the transformed Machine (measured coordinates) are used rather than 
-        //  the theoretical/expected coordinates of the fiducial marks.  They should be close to 
-        //  identical, but it is the affines and therefore the transformed points that define the 
-        //  actual work space.  
-        pt1[0] = affines[i].A2I[0] * obs[affines[i].indeces[1]-1].mach[0] + 
-                 affines[i].A2I[1] * obs[affines[i].indeces[1]-1].mach[1] + 
-                 affines[i].A2I[4];  
-
-        pt1[1] = affines[i].A2I[2] * obs[affines[i].indeces[1]-1].mach[0] + 
-                 affines[i].A2I[3] * obs[affines[i].indeces[1]-1].mach[1] + 
+
+        //for this calculation the transformed Machine (measured coordinates) are used rather than
+        //  the theoretical/expected coordinates of the fiducial marks.  They should be close to
+        //  identical, but it is the affines and therefore the transformed points that define the
+        //  actual work space.
+        pt1[0] = affines[i].A2I[0] * obs[affines[i].indeces[1]-1].mach[0] +
+                 affines[i].A2I[1] * obs[affines[i].indeces[1]-1].mach[1] +
+                 affines[i].A2I[4];
+
+        pt1[1] = affines[i].A2I[2] * obs[affines[i].indeces[1]-1].mach[0] +
+                 affines[i].A2I[3] * obs[affines[i].indeces[1]-1].mach[1] +
                  affines[i].A2I[5];
 
-        pt2[0] = affines[i].A2I[0] * obs[affines[i].indeces[1]  ].mach[0] + 
-                 affines[i].A2I[1] * obs[affines[i].indeces[1]  ].mach[1] + 
+        pt2[0] = affines[i].A2I[0] * obs[affines[i].indeces[1]  ].mach[0] +
+                 affines[i].A2I[1] * obs[affines[i].indeces[1]  ].mach[1] +
                  affines[i].A2I[4];
 
-        pt2[1] = affines[i].A2I[2] * obs[affines[i].indeces[1]  ].mach[0] + 
-                 affines[i].A2I[3] * obs[affines[i].indeces[1]  ].mach[1] + 
+        pt2[1] = affines[i].A2I[2] * obs[affines[i].indeces[1]  ].mach[0] +
+                 affines[i].A2I[3] * obs[affines[i].indeces[1]  ].mach[1] +
                  affines[i].A2I[5];
 
 
@@ -466,7 +474,7 @@ namespace Isis {
 
         //vector in the direction of a line
         v[0] = pt1[0] - pt2[0];
-        v[1] = pt1[1] - pt2[1];  
+        v[1] = pt1[1] - pt2[1];
 
         //using det as the scale factor along the line from pt1 to the point nearest the origin
         det = -(pt1[0]*v[0] + pt1[1]*v[1])/(v[0]*v[0]+v[1]*v[1]);
@@ -475,14 +483,14 @@ namespace Isis {
         // so that it lies on the y axis is...
         angle = atan((pt1[0]+det*v[0])/(pt1[1]+det*v[1]));
 
-        //and since we're only ever going to be concerned with rotating the y coordinates and z's 
-        // are alwyas zero there are only two values we need to save to elements of the rotation 
+        //and since we're only ever going to be concerned with rotating the y coordinates and z's
+        // are alwyas zero there are only two values we need to save to elements of the rotation
         // matrix
         affines[i].rotI[0] =  sin(angle);
         affines[i].rotI[1] =  cos(angle);
 
         //any machine coordinate [u,v] can be rotated into a system where greatest y values of the
-        // affine border are the same that is the border is a line parrallel to the image x axis,   
+        // affine border are the same that is the border is a line parrallel to the image x axis,
         // and therefore the greatest y value in a particular affine is
         affines[i].mI = pt1[0]*affines[i].rotI[0] + pt1[1]*affines[i].rotI[1];
 
@@ -495,7 +503,7 @@ namespace Isis {
 
 
 
-     //all the parameters necessary for the machine2image and image2machin coordinate 
+     //all the parameters necessary for the machine2image and image2machin coordinate
      //  transformations are now computed and stored
 
 
@@ -506,7 +514,7 @@ namespace Isis {
      //calculate and store residuals
      for (i=0; i<90; i++) {
         if (obs[i].flag) {   //if the point has been observed...
-           //convert the theoretical image coordinate to machine space and compare it to the 
+           //convert the theoretical image coordinate to machine space and compare it to the
            // measured coordinate--this way residuals are in pixels
            image2Machine(obs[i].image[0],obs[i].image[1],&pt1[0],&pt1[1]);
 
@@ -521,7 +529,7 @@ namespace Isis {
   }
 
   /**
-   * This method does an in place (overwriting input) conversion of a cube coordinate 
+   * This method does an in place (overwriting input) conversion of a cube coordinate
    * (sample, line) into image coordinates
    * Call after computeInteriorOrienation()
    *
@@ -548,10 +556,10 @@ namespace Isis {
     }
     else {//now step through the affines to determine in the domain of which one this point lies
       for (i=0; i<n-1; i++) {
-        temp = *machineX * affines[i].rotM[0] + *machineY * affines[i].rotM[1];    
+        temp = *machineX * affines[i].rotM[0] + *machineY * affines[i].rotM[1];
 
         //if the point is in the domain of this affine do the conversion...
-        if (temp <= affines[i].mM)  
+        if (temp <= affines[i].mM)
           break;
       }
     }
@@ -567,7 +575,7 @@ namespace Isis {
   }
 
  /**
-   * This method does a conversion of a cube coordinates 
+   * This method does a conversion of a cube coordinates
    * (sample, line) into image coordinates
    * Call after computeInteriorOrienation()
    *
@@ -580,31 +588,31 @@ namespace Isis {
    * @param imageY Output, the y coordinate (line) in cube space
    *
    * @return 1  success
-   * @return -1 failure, y coordinate to be converted is too small, it is not within the 
+   * @return -1 failure, y coordinate to be converted is too small, it is not within the
    *            domain of the image machine space
-   * @return -2 failure, y coordinate to be converted is too large, it is not within the 
+   * @return -2 failure, y coordinate to be converted is too large, it is not within the
    *            domain of the image machine space
    * @return 0  failure, coordinate not within domain of the affines
    * @return 1  successful conversion
    *
    */
-  int ApolloPanIO::machine2Image(double machineX, 
-                                 double machineY, 
-                                 double *imageX, 
+  int ApolloPanIO::machine2Image(double machineX,
+                                 double machineY,
+                                 double *imageX,
                                  double *imageY) {
 
      int i;
 
      *imageX = machineX;
      *imageY = machineY;
-   
+
      i = machine2Image(imageX,imageY);
 
      return i;
   }
 
  /**
-   * This method does an in place (overwriting input) conversion of an image coordinate 
+   * This method does an in place (overwriting input) conversion of an image coordinate
    * into cube (machine) coordinates (sample, line)
    * Call after computeInteriorOrienation()
    *
@@ -632,9 +640,9 @@ namespace Isis {
       //now step through the affines to determine in the domain of which one this point lies
       for (i=0; i<n-1; i++) {
         temp = *imageX * affines[i].rotI[0] + *imageY * affines[i].rotI[1];
-       
+
         //if the point is in the domain of this affine do the conversion...
-        if( temp >= affines[i].mI)  
+        if( temp >= affines[i].mI)
           break;
       }
     }
@@ -650,7 +658,7 @@ namespace Isis {
   }
 
  /**
-   * This method does a conversion of an image coordinates 
+   * This method does a conversion of an image coordinates
    * to a cube (sample, line) coordinates.
    * Call after computeInteriorOrienation()
    *
@@ -663,24 +671,24 @@ namespace Isis {
    * @param machineY Output, the y coordinate (line) in cube space
    *
    * @return 1  success
-   * @return -1 failure, y coordinate to be converted is too small, it is not within the 
+   * @return -1 failure, y coordinate to be converted is too small, it is not within the
    *            domain of the image machine space
-   * @return -2 failure, y coordinate to be converted is too large, it is not within the 
+   * @return -2 failure, y coordinate to be converted is too large, it is not within the
    *            domain of the image machine space
    * @return 0  failure, coordinate not within domain of the affines
    * @return 1  successful conversion
    *
    */
-  int ApolloPanIO::image2Machine(double imageX, 
-                                 double imageY, 
-                                 double *machineX, 
+  int ApolloPanIO::image2Machine(double imageX,
+                                 double imageY,
+                                 double *machineX,
                                  double *machineY) {
-     /* This class method converts a machine coordinate to an image coordinate 
+     /* This class method converts a machine coordinate to an image coordinate
         (overwriting the input arguments)
-      
+
         imageX -> machine x input
         imageY -> machine y input
-        machineX   <- to be overwritten as the converted coordinate  
+        machineX   <- to be overwritten as the converted coordinate
         machineY   <- to be overwritten as the converted coordinate
      */
 
@@ -709,7 +717,7 @@ namespace Isis {
 
       for (i=0; i<90; i++) {
         if (obs[i].flag) {
-           l = sqrt(obs[i].residuals[0]*obs[i].residuals[0] + 
+           l = sqrt(obs[i].residuals[0]*obs[i].residuals[0] +
                     obs[i].residuals[1]*obs[i].residuals[1]);
 
            if( l > maxR)
@@ -725,7 +733,7 @@ namespace Isis {
 
       for (i=0; i<90; i++) {
          if(obs[i].flag) {
-            l = sqrt(obs[i].residuals[0]*obs[i].residuals[0] + 
+            l = sqrt(obs[i].residuals[0]*obs[i].residuals[0] +
                      obs[i].residuals[1]*obs[i].residuals[1]);
 
             stdevR += (l-meanR)*(l-meanR);
@@ -740,7 +748,7 @@ namespace Isis {
   /**
    * Accessor for the standard deviation of the residual vector lenghts
    * Call after computeInteriorOrienation() and calc_residual_stats()
-   * 
+   *
    * @return -1 value not yet calculated
    */
   double ApolloPanIO::stdevResiduals() {
@@ -752,7 +760,7 @@ namespace Isis {
   /**
    * Accessor for the mean (average) of the residual vector lenghts
    * Call after computeInteriorOrienation() and calc_residual_stats()
-   * 
+   *
    * @return -1 value not yet calculated
    */
   double ApolloPanIO::meanResiduals()
@@ -763,7 +771,7 @@ namespace Isis {
   /**
    * Accessor for the mean (average) of the residual vector lenghts
    * Call after computeInteriorOrienation() and calc_residual_stats()
-   * 
+   *
    * @return -1 value not yet calculated
    */
   double ApolloPanIO::maxResiduals()
diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.h b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.h
index b778c6d5240eeade681f67bd29cb2ecf4a2f839e..15f4463fe297f6c018019230fefc9cb30a6784fb 100644
--- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.h
+++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.h
@@ -1,28 +1,13 @@
 #ifndef ApolloPanIO_h
 #define ApolloPanIO_h
 
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.7 $                                                             
- * $Date: 2005/10/03 22:43:39 $                                                                 
- *                                                                        
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */                                                                
 
 namespace Isis {
  /* Numbering scheme for the fiducial marks
@@ -35,30 +20,30 @@ namespace Isis {
  */
 
 
- /**                                                                       
+ /**
   * @brief Calculates a series of affine transformations from the measured coordinates of the
   *   up to 90 fiducial marks on a complete (stiched) apollo panoramic cube
-  *                                                                        
+  *
   * Description: The 90 Fiducial marks effectively divide a complete (stitched) apollo panormaic
-  *   cube into 44 rectangular regions.  42 of these represent the same period of time, T, the 
+  *   cube into 44 rectangular regions.  42 of these represent the same period of time, T, the
   *   center two are 0.5T.  This class uses up to 44 2 dimensional affine transformations linked
   *   together with first order continuity conditions at the boundaries to enforce consistent
   *   line scan durations and correct warping in the film.
-  *   
+  *
   * @ingroup Apollo
-  *                                                                        
+  *
   * @author 2011-09-19 Orrin Thomas
-  *                                                                        
-  * @internal                                                              
+  *
+  * @internal
   *   @history 2011-09-19 Orrin Thomas - Original version
   *   @history 2012-07-10 Orrin Thomas - Updated to current coding standards
   *   @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807.
-  */        
+  */
   class ApolloPanIO
   {
   private:
-    
-    /** 
+
+    /**
      * C style structure for storing the calculation optimized parameters of a forward and
      * reverse 2D affine transformation
      */
@@ -66,17 +51,17 @@ namespace Isis {
       int flag;         //!< solve flag
       double A2I[6];    //!< transformation coefficients to go to image coordinates
       double A2M[6];    //!< transformation coefficients to go to machine coordinates
-      
+
       /**
        * Coefficients to rotate machine coordinates so that the right edge of the region is vertical
        */
-      double rotM[2];   
-      
+      double rotM[2];
+
       /**
        * Coefficients to rotate Image coordinates so that the right edge of the region is vertical
        */
-      double rotI[2];  
-      
+      double rotI[2];
+
       double mI;        //!< max rotated image y coordinate in the region
       double mM;        //!< max rotate machine y coordinate in the region
       int indeces[2];   //!< indeces of the first and last fiducial marks included in this region
@@ -93,7 +78,7 @@ namespace Isis {
     }FidObs;
 
     /**
-     * an array of discreet affine transformations pertaining to regions of the image 
+     * an array of discreet affine transformations pertaining to regions of the image
      * (there can never be more than 44)
      */
     Affine2D affines[44];
@@ -101,8 +86,8 @@ namespace Isis {
     FidObs obs[90];  //!< array to hold all possible observations of fiducial marks
     int n;           //!< the number of affines used to model the image
     double maxR;     //!< maximum residual vector length
-    double meanR;    //!< mean of residual vector lenghts  
-    double stdevR;   //!< standard deviation of residual vector lengths 
+    double meanR;    //!< mean of residual vector lenghts
+    double stdevR;   //!< standard deviation of residual vector lengths
 
     void calc_residual_stats();
 
diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.cpp b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.cpp
index e73055c90e04ea81b95fb0a574a3e49719d59d35..8b485ca84d40d62418c35444ce73dd469e4546af 100644
--- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.cpp
+++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ApolloPanoramicCamera.h"
 
 #include "ApolloPanIO.h"
@@ -29,16 +37,16 @@ namespace Isis {
     SetFocalLength(610.0);  //nominal (uncalibrated) focal length in mm from "Apollo 15 SIM Bay
     // Photographic Equipment and Mission Summary" August, 1971
     SetPixelPitch(0.005);   //internally all images are modeled as if they have 5 micron pixels
-    
+
     double  constantTimeOffset = 0.0,
     additionalPreroll = 0.0,
     additiveLineTimeError = 0.0,
     multiplicativeLineTimeError = 0.0;
-    
+
     // Set up naming info
     m_instrumentNameLong = "Panoramic Camera";
     m_instrumentNameShort = "Pan";
-    
+
     // Apollo15 Pan naif code = -915230
     if (naifIkCode() == -915230) {
       m_spacecraftNameLong = "Apollo 15";
@@ -58,78 +66,78 @@ namespace Isis {
       QString msg = "File does not appear to be an Apollo image";
       throw IException(IException::User, msg, _FILEINFO_);
     }
-    
+
     //following keywords in InstrumentAddendum file
     QString ikernKey = "INS" + toString((int)naifIkCode()) + "_CONSTANT_TIME_OFFSET";
     constantTimeOffset = getDouble(ikernKey);
-    
+
     ikernKey = "INS" + toString((int)naifIkCode()) + "_ADDITIONAL_PREROLL";
     additionalPreroll = getDouble(ikernKey);
-    
+
     ikernKey = "INS" + toString((int)naifIkCode()) + "_ADDITIVE_LINE_ERROR";
     additiveLineTimeError = getDouble(ikernKey);
-    
+
     ikernKey = "INS" + toString((int)naifIkCode()) + "_MULTIPLI_LINE_ERROR";
     multiplicativeLineTimeError = getDouble(ikernKey);
-    
-    Pvl &lab = *cube.label(); 
+
+    Pvl &lab = *cube.label();
     PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse);
-    QString stime = (QString)inst["StartTime"];  
+    QString stime = (QString)inst["StartTime"];
     SpiceDouble etStart;
     str2et_c(stime.toLatin1().data(), &etStart);
     stime = (QString) inst["StopTime"];
     SpiceDouble etStop;
     str2et_c(stime.toLatin1().data(), &etStop);
     iTime isisTime( (QString) inst["StartTime"]);
-    
+
     // Get other info from labels
     // line exposure duration, sec/mm
-    double lineRate = ( (double) inst["LineExposureDuration"] )*0.005;    
-    
+    double lineRate = ( (double) inst["LineExposureDuration"] )*0.005;
+
     lineRate *= 1.0 + multiplicativeLineTimeError;
     lineRate += additiveLineTimeError;
     etStart += additionalPreroll * lineRate;
     etStart += constantTimeOffset;
-    
+
     setTime(isisTime);
-    
+
     // Setup detector map
-    //note (etStart+etStop)/2.0 is the time in the middle of image 
+    //note (etStart+etStop)/2.0 is the time in the middle of image
     //  (line = 0 after interior orientation)
-    ApolloPanoramicDetectorMap *detectorMap = 
-    new ApolloPanoramicDetectorMap((Camera *)this, 
-                                   (etStart+etStop)/2.0, 
+    ApolloPanoramicDetectorMap *detectorMap =
+    new ApolloPanoramicDetectorMap((Camera *)this,
+                                   (etStart+etStop)/2.0,
                                    (double)lineRate, &lab);
     //interior orientation residual stats
     m_residualMean = detectorMap->meanResidual();
     m_residualMax = detectorMap->maxResidual();
     m_residualStdev = detectorMap->stdevResidual();
-    
+
     detectorMap->SetDetectorSampleSumming(1.0);
     detectorMap->SetStartingDetectorSample(0.0);
     // Setup focal plane map
     PvlGroup &kernel = lab.findGroup("Kernels", Pvl::Traverse);
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, (int) kernel["NaifFrameCode"]);
-    
+
     //  Retrieve boresight location from instrument kernel (IK) (addendum?)
     double sampleBoreSight = 0.0;  //Presently no NAIF keywords for this sensor
     double lineBoreSight = 0.0;  //Presently no NAIF keywords for this sensor
-    
+
     focalMap->SetDetectorOrigin(sampleBoreSight, lineBoreSight);
     focalMap->SetDetectorOffset(0.0, 0.0);
-    
+
     // Setup distortion map
     new CameraDistortionMap(this, -1.0);
     //distMap->SetDistortion(naifIkCode());    Presently no NAIF keywords for this sensor
-    
+
     //Setup the ground and sky map
     new LineScanCameraGroundMap(this);
     new LineScanCameraSkyMap(this);
-    
+
     PvlGroup &instP = lab.findGroup("Kernels", Pvl::Traverse);
     m_CkFrameId = toInt(instP["NaifFrameCode"][0]);
     m_CkFrameId = -int(-m_CkFrameId/1000)*1000;
-    
+
     LoadCache();
   }
 }// end Isis namespace
diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.h b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.h
index 1a0e5bfceb849699e28ddb93035222fbb418b356..384a1be062b66c9035e45038f3519be82d20ef66 100644
--- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.h
+++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.h
@@ -1,55 +1,40 @@
 #ifndef ApolloPanoramicCamera_h
 #define ApolloPanoramicCamera_h
 
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.7 $                                                             
- * $Date: 2005/10/03 22:43:39 $                                                                 
- *                                                                        
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */                                                                     
 
 #include "LineScanCamera.h"
 
 namespace Isis {
   class PvlGroup;
-    /**                                                                       
+    /**
      * @brief Apollo Panoramic Camera
-     *                                                                        
+     *
      * Description: Geometric camera model for the Apollo Panoramic Camera
      *
      * @ingroup Apollo
-     *                                                                        
+     *
      * @author 2011-09-19 Orrin Thomas
-     *                                                                        
-     * @internal                                                              
+     *
+     * @internal
      *   @history 2011-09-19 Orrin Thomas - Original version
-     *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+     *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
      *                           coding standards. References #972.
      *   @history 2012-07-10 Orrin Thomas - Updated to current coding standards
      *   @history 2015-09-01 Ian Humphrey and Makayla Shepherd - Added new data members and
      *                           methods to get spacecraft and instrument names.
-     *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+     *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
      *                           members and methods and removed implementation of these methods
-     *                           since Camera now handles this. References #2335. Fixed 
+     *                           since Camera now handles this. References #2335. Fixed
      *                           indentation.
      *   @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807.
-     */        
+     */
     class ApolloPanoramicCamera : public LineScanCamera {
     public:
       ApolloPanoramicCamera(Cube &lab);
@@ -58,54 +43,54 @@ namespace Isis {
       ~ApolloPanoramicCamera() {};
 
       /**
-      * CK frame ID -  - Instrument Code 
-      *  
-      * @return @b int The appropriate instrument code for the "Camera-matrix" 
+      * CK frame ID -  - Instrument Code
+      *
+      * @return @b int The appropriate instrument code for the "Camera-matrix"
       *         Kernel Frame ID
       */
-      //this sensor was used on multiple missions so it is necessary to check which Apollo 
-      virtual int CkFrameId() const {return m_CkFrameId; }  
+      //this sensor was used on multiple missions so it is necessary to check which Apollo
+      virtual int CkFrameId() const {return m_CkFrameId; }
 
-      /** 
+      /**
       * CK Reference ID - J2000
-      * 
+      *
       * @return @b int The appropriate instrument code for the "Camera-matrix"
       *         Kernel Reference ID
       */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
       *  SPK Reference ID - J2000
-      *  
-      * @return @b int The appropriate instrument code for the Spacecraft 
+      *
+      * @return @b int The appropriate instrument code for the Spacecraft
       *         Kernel Reference ID
       */
       virtual int SpkReferenceId() const { return (1); }
 
-      /** 
+      /**
        * Returns residual summary statistics from interior orientation as a PvlGroup
-       * 
+       *
        * @return PvlGroup Residuals report.
        */
       PvlGroup intOriResidualsReport();
 
       /**
        * Max interior orientation residual vector length, accesor
-       * 
+       *
        * @return double Residual max
        */
       double intOriResidualMax()   const { return m_residualMax; }
 
       /**
        * Mean (average) of interior orientation residual vector length, accesor
-       * 
+       *
        * @return double Residual mean
        */
       double intOriResidualMean()  const { return m_residualMean; }
 
       /**
        * Standard deviation of interior orientation residual vector length, accesor
-       * 
+       *
        * @return double Residual standard deviation
        */
       double intOriResidualStdev() const { return m_residualStdev; }
diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.cpp b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.cpp
index 66a768b83122e4b4f25f4898e05ef6174c05aeca..01fddfbb1d8831ab6b2ff38ee815c89838b3818d 100644
--- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.cpp
+++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ApolloPanoramicDetectorMap.h"
 #include "Application.h"
 #include "PvlGroup.h"
@@ -19,12 +27,12 @@ namespace Isis {
    * @return bool Always returns true
    */
     bool ApolloPanoramicDetectorMap::SetDetector(const double sample, const double line) {
-      //given a detector coordinate and a time (read from the 'parent' camera class) 
+      //given a detector coordinate and a time (read from the 'parent' camera class)
       //  set the image coordinates
       //save the detector coordinates
       //negative signs are counterintuitive and I cannot fully explain them, I believe they are
       // because of the negative z direction in the distortion map....
-      p_detectorLine = -line;  
+      p_detectorLine = -line;
       p_detectorSample = -sample;
 
       //convert from detector to fiducial coordinants
@@ -48,14 +56,14 @@ namespace Isis {
    * @return bool Always returns true
    */
     bool ApolloPanoramicDetectorMap::SetParent(const double sample, const double line) {
-      //Given an image (aka 'Parent', aka encoder, aka machine) coordinate set the detector 
+      //Given an image (aka 'Parent', aka encoder, aka machine) coordinate set the detector
       //coordiante and the time (time is set in the 'parent' camera class)
       //save the parent data
       p_parentLine = line;
       p_parentSample = sample;
       //convert from machine to fiducial coordinates
       //cout << "cube coordinates sent to IO: " << sample << " " << line << endl; //debug
-    
+
       p_intOri.machine2Image(sample,line,&p_detectorSample, &p_detectorLine);
 
       //cout << "fiducial coordinate return from IO: " << p_detectorSample << " " << p_detectorLine << endl;
@@ -63,32 +71,32 @@ namespace Isis {
       iTime isisTime(m_etMiddle + p_detectorLine*m_lineRate);
       p_camera->setTime(isisTime);
       //This declaration may cause some debate.  Regardless it seems to that
-      //  since we model the motion of the camera as continuous smooth motion 
+      //  since we model the motion of the camera as continuous smooth motion
       //  (not some discretely defined series of 1 pixel or 1 mm wide 'push-frames'),
       //  and we calculate the positions, pointings, etc at the specific time implied
       //  by the sub-pixel/mm line then the line in the dector will always be the same
       //  (in this case zero)
-      p_detectorLine = 0.0;  
+      p_detectorLine = 0.0;
 
       return true;
     }
 
     /**
-     * This method uses the ApolloPanIO class to compute transforamtion from cube to image 
+     * This method uses the ApolloPanIO class to compute transforamtion from cube to image
      * (aka fiducial cooraintes)
-     * 
+     *
      * @throws  IException::User "No FID_MEASURES table found in cube blobs."
      * @throws  IException::User "Less than four FID_MEASURES found in cube blobs."
      * @throws  IException::User "Insufficient Fiducial Observations for computation of the interior
-     *                            orientation. At least one vertical pair must be measured, many 
+     *                            orientation. At least one vertical pair must be measured, many
      *                            more is recomented."
-     * 
+     *
      * @returns int Returns 1 on success and -1 on failure.
      */
     int ApolloPanoramicDetectorMap::initializeInteriorOrientation() {
       int i,nrec;
-      //read the fidicial measurements from the attached table in the camera labels to define a 
-      //  series of affine transformation between image (aka encoder aka machine) coordinates 
+      //read the fidicial measurements from the attached table in the camera labels to define a
+      //  series of affine transformation between image (aka encoder aka machine) coordinates
       //  and fiducial coordinates
       Table tableFid("Fiducial Measurement", m_lab->fileName());
 
@@ -110,7 +118,7 @@ namespace Isis {
         p_intOri.fiducialObservation(tableFid[i][0], tableFid[i][1], tableFid[i][2]);
 
       i = p_intOri.computeInteriorOrienation();
-      
+
       if( i != 1) { //unsuccessful computation of the interior orienation
         throw IException(IException::User,"Insufficient Fiducial Observations for computation of "
                                           "the interior orientation.\nAt least one vertical pair "
diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.h b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.h
index 314ee440917ee0ea6aee9dca0ee22299ca7e7a72..c4666448d07a0dfb7b870a1c17e69e68b4fc06ed 100644
--- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.h
+++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.h
@@ -1,29 +1,13 @@
 #ifndef ApolloPanoramicDetectorMap_h
 #define ApolloPanoramicDetectorMap_h
 
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.7 $                                                             
- * $Date: 2005/10/03 22:43:39 $                                                                 
- *                                                                        
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+/** This is free and unencumbered software released into the public domain.
 
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */                                                                   
 
 #include "ApolloPanIO.h"
 #include "LineScanCameraDetectorMap.h"
@@ -31,20 +15,20 @@
 #include "PvlGroup.h"
 
 namespace Isis {
-    /**                                                                       
-     * @brief Convert between parent image (aka encoder aka machine)  coordinates and detector 
+    /**
+     * @brief Convert between parent image (aka encoder aka machine)  coordinates and detector
      *         coordinates
-     *                                                                        
+     *
      * This class is used to convert between parent image (aka encoder aka machine) coordinates
-     * (sample/line) and detector coordinates for a the Apollo Panoramic Image. 
-     *                                                                        
+     * (sample/line) and detector coordinates for a the Apollo Panoramic Image.
+     *
      * @author 2011-11-21 Orrin Thomas
-     *                                                                        
-     * @internal                                                              
+     *
+     * @internal
      *   @history 2011-11-21 Orrin Thomas - Original version
      *   @history 2012-07-10 Orrin Thomas - Updated to current coding standards
      *   @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807.
-     */        
+     */
     class ApolloPanoramicDetectorMap : public CameraDetectorMap {
     public:
       /**
@@ -87,7 +71,7 @@ namespace Isis {
 
       /**
        * Return the time in seconds between scan lines
-       * 
+       *
        * @return double Time in seconds between scan lines
        */
       double LineRate() const {
@@ -96,28 +80,28 @@ namespace Isis {
 
       /**
        * Mean (average) of interior orientation residual vector lengths, accesor
-       * 
+       *
        * @return double Mean of interior orientation residual vector lengths
        */
       double  meanResidual() { return p_intOri.meanResiduals(); };
 
       /**
        * Max interior orientation residual vector length, accesor
-       * 
+       *
        * @return double Max interior orientation residual vector length
        */
       double   maxResidual() { return p_intOri.maxResiduals(); };
 
       /**
        * Standard deviation of interior orientation residual vector lengths, accesor
-       * 
+       *
        * @return double Standard deviation of interior orientation residual vector lengths
        */
       double stdevResidual() { return p_intOri.stdevResiduals(); };
 
       private:
-        
-        double m_etMiddle; //!< Ephemeris time at the middle line 
+
+        double m_etMiddle; //!< Ephemeris time at the middle line
         double m_lineRate; //!< line exposure duration
         Pvl *m_lab;        //!< Image label used to construct camera object
 
@@ -130,4 +114,3 @@ namespace Isis {
     };
 };
 #endif
-
diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp b/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp
index d07760943924b0e6c0073a4cf8b99690891d2aa0..b38b74efea51f529887c562a13c9b51ee1f25f6d 100644
--- a/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp
+++ b/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -44,7 +33,7 @@ int main(void) {
   cout << "Unit Test for ApolloCamera..." << endl;
   try {
 
- 
+
 
     // These should be lat/lon at center of image. To obtain these numbers for a new cube/camera,
     // set both the known lat and known lon to zero and copy the unit test output "Latitude off by: "
@@ -78,8 +67,8 @@ int main(void) {
     cout << "CK Reference ID = " << camTL->CkReferenceId() << endl;
     cout << "SPK Target ID = " << camTL->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << camTL->SpkReferenceId() << endl << endl;
-    
-         
+
+
     // Test all four corners to make sure the conversions are right
     cout << "For upper left corner ..." << endl;
     TestLineSamp(camTL, 1.0, 1.0);
@@ -113,7 +102,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << camM->UniversalLongitude() - knownLon << endl;
     }
-    
+
     //TODO - test name methods for Apollo16 and 17 Panoramic
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
@@ -121,17 +110,17 @@ int main(void) {
     cout << "Spacecraft Name Short: " << camM->spacecraftNameShort() << endl;
     cout << "Instrument Name Long: " << camM->instrumentNameLong() << endl;
     cout << "Instrument Name Short: " << camM->instrumentNameShort() << endl << endl;
-    
+
     // Test exception: camera is not a supported Kaguya camera
     cout << endl << "Testing exceptions:" << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
     ApolloPanoramicCamera pCam(test);
-    
+
   }
   catch(IException &e) {
     e.print();
   }
-  
+
 }
 
 void TestLineSamp(Camera *cam, double samp, double line) {
@@ -153,4 +142,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl;
   }
 }
-
diff --git a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp
index 2c963d4b28c586e2d128e3e108e22c29625eb13a..c0eeb2808ce9eb92d9ac0e45c6bb25368a0464a2 100644
--- a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp
+++ b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp
@@ -1,21 +1,10 @@
-/**
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 //Isis.h and IsisDebug.h if needed
 
@@ -41,7 +30,7 @@ namespace Isis {
 
   /**
    * Constructs a CentroidApolloPan object.
-   * 
+   *
    * @param pixelSizeMicrons The pixel size in microns
    */
   CentroidApolloPan::CentroidApolloPan(double pixelSizeMicrons)
@@ -52,7 +41,7 @@ namespace Isis {
       this->m_pixelSize = 5.0;  //if a negative or zero value is passed set the default
   }
 
-  
+
   /**
    * Destroys the CentroidApolloPan object
    */
@@ -60,9 +49,9 @@ namespace Isis {
 
   /**
    * Set the pixel size in microns
-   * 
+   *
    * @param microns The pixel size value to set
-   * 
+   *
    * @return bool Returns false if microns is <= 0, else true.
    */
   bool CentroidApolloPan::setPixelSize(double microns)
@@ -73,29 +62,29 @@ namespace Isis {
   }
 
   /**
-   * Given a range of DN this function creates a biniary chip for all continuous pixels that have 
-   * the DN within the specified range using the center pixel of the chip as the seed value 
-   * 
-   * @param inputChip Chip centered around some centroidable feature (dark or light continous 
+   * Given a range of DN this function creates a biniary chip for all continuous pixels that have
+   * the DN within the specified range using the center pixel of the chip as the seed value
+   *
+   * @param inputChip Chip centered around some centroidable feature (dark or light continous
    *                  block of pixels)
    * @param[out] selectionChip Binary chip of selected and unselected pixels
-   * 
+   *
    * @return int Returns 0 if the input chips aren't 2D, else return 1
    */
   int CentroidApolloPan::selectAdaptive(Chip *inputChip,Chip *selectionChip) {
     /*
-    Given a range of DN this function creates a biniary chip for all continuous pixels that have the 
+    Given a range of DN this function creates a biniary chip for all continuous pixels that have the
     DN within the specified range using the center pixel of the chip as the seed value
     input:
       m_minDN,m_maxDN  set using the this->SetDNRange(..)
-      inputChip  chip centered around some centroidable feature (dark or light continous block of 
+      inputChip  chip centered around some centroidable feature (dark or light continous block of
       pixels)
-    
+
     output:
       selectionChip  binary chip of selected and unselected pixels
 
     */
-    
+
     //check the sizes of the chips and make the selectionChip match the inputChip
     int lines, samples;
 
@@ -104,7 +93,7 @@ namespace Isis {
     double minDN,maxDN,temp;
 
     vector< double> dn;
-    
+
     lines = inputChip->Lines();
     samples = inputChip->Samples();
     //printf("DEBUG: samples: %d  lines: %d\n",samples,lines);
@@ -152,55 +141,55 @@ namespace Isis {
 
     this->select(inputChip,selectionChip);
 
-    this->setDNRange(minDN,maxDN); //restore original DN range   
+    this->setDNRange(minDN,maxDN); //restore original DN range
 
     return 1;
-  }  
+  }
 
 
   /**
-   * This method will take advantage of all the apriori knowlege we have of the size and orientation 
-   * of the ellipse to speed up elliptical reduction. 
-   * 
-   * The general elliptical reduction tool provided in the selection class is slow for the very 
+   * This method will take advantage of all the apriori knowlege we have of the size and orientation
+   * of the ellipse to speed up elliptical reduction.
+   *
+   * The general elliptical reduction tool provided in the selection class is slow for the very
    * large and potentially noisy ellipses of the apollo pan data.
-   * 
+   *
    * Specifically we know:
-   *    semiMajor Axis,a, is approximately parrallel to the sample chip axis and is 
+   *    semiMajor Axis,a, is approximately parrallel to the sample chip axis and is
    *      approximately 60 5-micron pixels long
-   *    semiMinor Axis,b, is approximately parrallel to the   line chip axis and is 
+   *    semiMinor Axis,b, is approximately parrallel to the   line chip axis and is
    *      approximately 60 5-micron pixels long
-   * 
-   * Hence we know the center of the ellipse is on the range [a+1,Samples-a],[b+1,lines-b] 
+   *
+   * Hence we know the center of the ellipse is on the range [a+1,Samples-a],[b+1,lines-b]
    * (because the entire ellipse must be within the chip)
-   * 
+   *
    * this->pixel_size will be used to do any scaling neccessary
-   * 
+   *
    * Algorithim:
    *    Step 1: Compile an array of all points on the border of the selected area
-   *    Step 2: Choose a previously unused hypothesis center point from the range 
+   *    Step 2: Choose a previously unused hypothesis center point from the range
    *      [a+1,samples-a],[b+1,lines-b]
    *    Step 3: For a given hypothesized ellipse center in the search set, define the Ellipse.
-   *    Step 4: Do a least squares generization.  Any points within a distance of play pixels to 
-   *      the edge of the ellipse are included in the gernalization. The distance check is repeated 
+   *    Step 4: Do a least squares generization.  Any points within a distance of play pixels to
+   *      the edge of the ellipse are included in the gernalization. The distance check is repeated
    *      for every iteration so the ellipse can effective grow to include more points.
-   *    Step 5: If the generization is successfully check to see if the area is at least as great as 
+   *    Step 5: If the generization is successfully check to see if the area is at least as great as
    *      the current best, and that the ellipse is contained in the chip
-   *    Step 6: If the area is great enough check that the percent selected is at least 
+   *    Step 6: If the area is great enough check that the percent selected is at least
    *      percent_selected.
-   *    Step 7: If all above tests are passed then we have a new Best ellipse and the number of 
+   *    Step 7: If all above tests are passed then we have a new Best ellipse and the number of
    *      consecutive emptySets is zeroed.  Otherwise emptySets++
-   *    Step 8: repeat steps 2 through 7 until pacience_limit consecquitive failures to find a 
+   *    Step 8: repeat steps 2 through 7 until pacience_limit consecquitive failures to find a
    *      better (larger area) elipse have occured
-   * 
+   *
    * @param selectionChip Binary chip of selected and unselected pixels
    * @param percent_selected Minimum percent of selected points
    * @param play Distance allowed in the least squares generization
    * @param patience_limit Maximum number of empty sets allowed
-   * 
+   *
    * @return int Return 0 if there isn't an ellipse that meets the selection criteria, else return 1
    */
-  int CentroidApolloPan::elipticalReduction(Chip *selectionChip, double percent_selected, 
+  int CentroidApolloPan::elipticalReduction(Chip *selectionChip, double percent_selected,
                                             double play, int patience_limit)
   {
     int i,j,k,l,
@@ -219,11 +208,11 @@ namespace Isis {
     double  a = 60.0*5.0/m_pixelSize,  //approximate semiMajor axis length
             b = 60.0*5.0/m_pixelSize,  //approximate semiMinor axis length
             dpt[2];        //double 2D point
-      
-    //printf("DEBUG: a: %lf b: %lf pixel_size: %lf\n",a,b,m_pixelSize);    
+
+    //printf("DEBUG: a: %lf b: %lf pixel_size: %lf\n",a,b,m_pixelSize);
     gsl_rng *randGen = gsl_rng_alloc(gsl_rng_taus);
     gsl_rng_set(randGen, time(NULL));  //using the current time as a seed value
-    
+
     samples = selectionChip->Samples();
     lines   = selectionChip->Lines();
     //printf("DEBUG selectionchip samples: %d lines: %d\n",samples,lines);
@@ -235,10 +224,10 @@ namespace Isis {
     i=int(floor(a+1.0));
 
     cen_pts.clear();
-    
+
     /*
-     * inorder to concentrate the search near the center of the chip we'll varry the step size for 
-     * the center search nodes quadratically from 1*5.0/m_pixelSize at the center to 
+     * inorder to concentrate the search near the center of the chip we'll varry the step size for
+     * the center search nodes quadratically from 1*5.0/m_pixelSize at the center to
      * 5.0*5.0/m_pixelSize at the edge
      */
     double searchStep = 5.0*5.0/m_pixelSize;
@@ -247,7 +236,7 @@ namespace Isis {
     centerSample = double((k+i)/2.0);
     centerLine   = double((l+j)/2.0);
     delta = (centerSample-double(i))*(centerSample-double(i)) + (centerLine  -double(l))*(centerLine  -double(l));  //square of the maximum distance from center of the search space
-   
+
     aSearch = (searchStep-cSearch)/delta;
 
     for (pt[0]=floor(a+1.0); pt[0]<k; pt[0]+=searchStep) {
@@ -267,7 +256,7 @@ namespace Isis {
     //printf("DEBUG: edgePoints: %d\n",pts.size());
 
     if (pts.size() ==0) return 0;
-  
+
     emptySets = 0;
     ellBest.area = 0.0;  //initialize the current best ellipse to zero area
 
@@ -336,7 +325,7 @@ namespace Isis {
       for (j=1;j<=lines;j++) {
         dpt[0] = double(i) ;
         dpt[1] = double(j) ;
-              
+
         if (!pointInEllipse(&ellBest,dpt,play)) {  //if the point isn't within play pixles of being within the elipse
           if( selectionChip->GetValue(i,j) == 1)
             selectionChip->SetValue(i,j,3.0);
@@ -346,5 +335,5 @@ namespace Isis {
     return 1;
 
   }
-  
+
 }
diff --git a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.h b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.h
index 8f2f6f275dd432ae26b47019df1f19c7fee70c89..03dc30a6daa5c8fa48272e67359caed8d2c94025 100644
--- a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.h
+++ b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.h
@@ -1,51 +1,37 @@
 #ifndef CentroidApolloPan_h
 #define CentroidApolloPan_h
-/**
- * @file
- * $Revision: 1.0 $
- * $Date: 2011/10/12 12:52:30 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Centroid.h"
 
 namespace Isis {
-  /**                                                                       
+  /**
    * @brief Selection class derived from the Pure Virtual Parent Class for all Selection classes
-   *                                                                        
+   *
    * Description coming soon
    *
    * @ingroup Selection
-   *                                                                        
+   *
    * @author 2011-10-22 Orrin Thomas
-   *                                                                        
-   * @internal                                                              
+   *
+   * @internal
    *   @history 2011-10-22 Orrin Thomas - Original version
    *   @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807.
-   */        
+   */
   class CentroidApolloPan : public Centroid {
   public:
-    
+
     CentroidApolloPan(double pixel_size_microns);
     virtual ~CentroidApolloPan();
     bool setPixelSize(double microns);
-  
+
     int elipticalReduction(Chip *selectionChip, double percent_selected, double play, int patience_limit);
     int selectAdaptive(Chip *inputChip,Chip *selectionChip);
 
diff --git a/isis/src/apollo/objs/CentroidApolloPan/unitTest.cpp b/isis/src/apollo/objs/CentroidApolloPan/unitTest.cpp
index 1a072cd152f92f9c4d53803c34615f087dfd6410..8672ef8fb374be41d2956e3dcd70eae14fb99886 100644
--- a/isis/src/apollo/objs/CentroidApolloPan/unitTest.cpp
+++ b/isis/src/apollo/objs/CentroidApolloPan/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 
 #include "CentroidApolloPan.h"
diff --git a/isis/src/cassini/apps/ciss2isis/main.cpp b/isis/src/cassini/apps/ciss2isis/main.cpp
index 244848ae7f8d9fe7283909bcab48e80f672d0e20..af65931be8485215f65e4d6454dfb99197829f8e 100644
--- a/isis/src/cassini/apps/ciss2isis/main.cpp
+++ b/isis/src/cassini/apps/ciss2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 //Source:  Cassini ISS Tour VICAR Image Data File and Detatched PDS Label SIS, Tour Version 1.1 December 1, 2004
 
 #include "Isis.h"
diff --git a/isis/src/cassini/apps/cisscal/DarkCurrent.cpp b/isis/src/cassini/apps/cisscal/DarkCurrent.cpp
index 091ed6a27d4e61f76b5088dd04984197ad1ec5b6..30ec2d27d3dd4112e06ea9a78c88965fe69599c6 100644
--- a/isis/src/cassini/apps/cisscal/DarkCurrent.cpp
+++ b/isis/src/cassini/apps/cisscal/DarkCurrent.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2009/05/27 21:26:15 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QDir>
 #include <algorithm>
diff --git a/isis/src/cassini/apps/cisscal/DarkCurrent.h b/isis/src/cassini/apps/cisscal/DarkCurrent.h
index 2323df1534135f38ba2de66eb36ca46fdce033da..b2478195ebe75e74a6eaecd9f116ef0a8fe3172d 100644
--- a/isis/src/cassini/apps/cisscal/DarkCurrent.h
+++ b/isis/src/cassini/apps/cisscal/DarkCurrent.h
@@ -1,26 +1,13 @@
 #ifndef DARKCURRENT_H
 #define DARKCURRENT_H
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2009/05/27 21:26:15 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 #include <QMap>
diff --git a/isis/src/cassini/apps/cisscal/main.cpp b/isis/src/cassini/apps/cisscal/main.cpp
index dcb69fce6bf1ba28be06f71f7fb5bda547027c3f..e78a4900061679043faad5550b0a7d993626c96f 100644
--- a/isis/src/cassini/apps/cisscal/main.cpp
+++ b/isis/src/cassini/apps/cisscal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include <algorithm>// sort, unique
 #include <cmath>
diff --git a/isis/src/cassini/apps/vims2isis/main.cpp b/isis/src/cassini/apps/vims2isis/main.cpp
index 6abcd97f49029ef3fe813f9219b5c5f52825106f..cce1439dfc45f053b58e1035da6e3f534fb5c5f9 100644
--- a/isis/src/cassini/apps/vims2isis/main.cpp
+++ b/isis/src/cassini/apps/vims2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <algorithm>
diff --git a/isis/src/cassini/apps/vimscal/main.cpp b/isis/src/cassini/apps/vimscal/main.cpp
index 13b14f7b4e9232ef6c4c45492817fb8cc81dfc97..fe78ac3f1d4fce25e1207d9fd305e4626b46674d 100644
--- a/isis/src/cassini/apps/vimscal/main.cpp
+++ b/isis/src/cassini/apps/vimscal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cfloat>
diff --git a/isis/src/cassini/apps/vimscal/vimscalUtil.h b/isis/src/cassini/apps/vimscal/vimscalUtil.h
index 516c20ff1d3b2d27c9eb3d676a9e69e5c9bd372d..3f433e4984b0df8005a8c0eafbaf78751dc944a4 100644
--- a/isis/src/cassini/apps/vimscal/vimscalUtil.h
+++ b/isis/src/cassini/apps/vimscal/vimscalUtil.h
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #ifndef VIMSCALUTIL_H
 #define VIMSCALUTIL_H
 
diff --git a/isis/src/cassini/objs/CissLabels/CissLabels.cpp b/isis/src/cassini/objs/CissLabels/CissLabels.cpp
index 863f26917ba24a1532c3ce1d5c07beec3a648bb9..4503676f7b6ce5c8683bcfd925fbc8e30fb7faa3 100644
--- a/isis/src/cassini/objs/CissLabels/CissLabels.cpp
+++ b/isis/src/cassini/objs/CissLabels/CissLabels.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <string>
 #include "CissLabels.h"
 #include "Pvl.h"
diff --git a/isis/src/cassini/objs/CissLabels/CissLabels.h b/isis/src/cassini/objs/CissLabels/CissLabels.h
index 287b06d228f14202fa5b7864d8fc198c719fbe3f..b54cb7139adeb64a237ef815a6d662dfd458159b 100644
--- a/isis/src/cassini/objs/CissLabels/CissLabels.h
+++ b/isis/src/cassini/objs/CissLabels/CissLabels.h
@@ -1,26 +1,13 @@
 #ifndef CISSLABELS_H
 #define CISSLABELS_H
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/11/07 22:45:20 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -392,7 +379,7 @@ namespace Isis {
       /**
        * @brief Returns ShutterStateId from the Instrument group.
        *
-       *  Indicates whether the shutter was enabled during image 
+       *  Indicates whether the shutter was enabled during image
        *  exposure. Valid values include "Disabled" and "Enabled".
        *
        *  @returns @b QString ShutterStateId
diff --git a/isis/src/cassini/objs/CissLabels/unitTest.cpp b/isis/src/cassini/objs/CissLabels/unitTest.cpp
index 80247c3816cd4688001f573337544acb0d338c52..7981f7323e73a98026cc20fab1d8c0e8ede5b15d 100644
--- a/isis/src/cassini/objs/CissLabels/unitTest.cpp
+++ b/isis/src/cassini/objs/CissLabels/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include "CissLabels.h"
 #include "IException.h"
diff --git a/isis/src/cassini/objs/CisscalFile/CisscalFile.cpp b/isis/src/cassini/objs/CisscalFile/CisscalFile.cpp
index 7c196a5cb3b2042666436413a3fa1b6c846b5058..bb596464e21ef5e2327ebc7c27da0b371af419d8 100644
--- a/isis/src/cassini/objs/CisscalFile/CisscalFile.cpp
+++ b/isis/src/cassini/objs/CisscalFile/CisscalFile.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.1 $
- * $Date: 2008/08/25 21:58:30 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include "IException.h"
diff --git a/isis/src/cassini/objs/CisscalFile/CisscalFile.h b/isis/src/cassini/objs/CisscalFile/CisscalFile.h
index 678e443f20114791b14123ab20464b9cad175db8..9f48e78ad2fd4d51c171b225b4abe008bd744377 100644
--- a/isis/src/cassini/objs/CisscalFile/CisscalFile.h
+++ b/isis/src/cassini/objs/CisscalFile/CisscalFile.h
@@ -1,26 +1,13 @@
 #ifndef CISSCALFILE_H
 #define CISSCALFILE_H
-/**
- * @file
- * $Revision: 1.1 $
- * $Date: 2008/08/25 21:58:30 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 
@@ -40,11 +27,11 @@ namespace Isis {
    *        <TT>"\begindata"</TT>.
    *
    * @ingroup Cassini-Huygens
-   * @author 2008-03-27 Jeannie Walldren 
-   * @internal 
+   * @author 2008-03-27 Jeannie Walldren
+   * @internal
    *   @history 2008-03-27 Jeannie Walldren - Original Version.
    *   @history 2011-05-03 Jeannie Walldren - Fixed documentation of ingroup
-   *                          name and added Isis disclaimer.
+   *                          name and added ISISdisclaimer.
    */
   class CisscalFile : public TextFile {
     public:
@@ -53,7 +40,7 @@ namespace Isis {
       //!> Destructor closes the text file.
       ~CisscalFile() {
         TextFile::Close();
-      }; 
+      };
       bool GetLine(QString &line);
     protected:
       bool p_begindataFound; //!> Flag variable indicates whether the tag <code>"\begindata"</code> has been found.
@@ -61,5 +48,3 @@ namespace Isis {
   };
 };
 #endif
-
-
diff --git a/isis/src/cassini/objs/CisscalFile/unitTest.cpp b/isis/src/cassini/objs/CisscalFile/unitTest.cpp
index 6a95ba43c64a9103da977dce3757bd0cc6159154..91851cf90cf96f4c0dacb20dae844ced1e312d86 100644
--- a/isis/src/cassini/objs/CisscalFile/unitTest.cpp
+++ b/isis/src/cassini/objs/CisscalFile/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include <stdio.h>
 #include <vector>
@@ -31,11 +20,11 @@
 using namespace std;
 using namespace Isis;
 
-/** 
- *  
- * @internal 
- * @history 2012-03-12 Tracie Sucharski - Replaced /tmp with $temporary 
- *  
+/**
+ *
+ * @internal
+ * @history 2012-03-12 Tracie Sucharski - Replaced /tmp with $temporary
+ *
  */
 int main(int argc, char *argv[]) {
   Preference::Preferences(true);
@@ -153,4 +142,3 @@ int main(int argc, char *argv[]) {
   }
   return 0;
 }
-
diff --git a/isis/src/cassini/objs/IssNACamera/IssNACamera.cpp b/isis/src/cassini/objs/IssNACamera/IssNACamera.cpp
index dc6b910939b66bdbbaa07891136a54a2a626fa93..7e0419b62f6516ace6935235d56fa12aceab7a12 100644
--- a/isis/src/cassini/objs/IssNACamera/IssNACamera.cpp
+++ b/isis/src/cassini/objs/IssNACamera/IssNACamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 // $Id: IssNACamera.cpp,v 1.6 2009/08/31 15:12:29 slambright Exp $
 #include "IssNACamera.h"
 
@@ -48,7 +36,7 @@ namespace Isis {
     m_instrumentNameShort = "ISSNA";
     m_spacecraftNameLong = "Cassini Huygens";
     m_spacecraftNameShort = "Cassini";
-    
+
     Pvl &lab = *cube.label();
 
     // Get the filter wheels positions dependent focal length.
@@ -60,12 +48,12 @@ namespace Isis {
       QString key = QString("INS%1_%2_FOCAL_LENGTH").
                       arg(naifIkCode()).arg(bandBin["FilterName"][0]);
       key = key.replace("/", "_");
-      focalLength = getDouble(key);   
+      focalLength = getDouble(key);
     }
     catch (IException &firstException) {
       try {
         QString key = "INS-82360_DEFAULT_FOCAL_LENGTH";
-        focalLength = getDouble(key);   
+        focalLength = getDouble(key);
       }
       catch (IException &secondException) {
         PvlGroup bandBin = lab.findGroup("BandBin", Pvl::Traverse);
@@ -155,12 +143,12 @@ namespace Isis {
 
 /**
  * This is the function that is called in order to instantiate a IssNACamera
- * object. 
+ * object.
  *
  * @param lab Cube labels
  *
  * @return Isis::Camera* IssNACamera
- * @internal 
+ * @internal
  *   @history 2011-05-03 Jeannie Walldren - Added documentation.  Removed
  *            Cassini namespace.
  */
diff --git a/isis/src/cassini/objs/IssNACamera/IssNACamera.h b/isis/src/cassini/objs/IssNACamera/IssNACamera.h
index bce876fed707f43f4cea6ad3768eeaf07bf3c7ba..c79ec30642b5008f65774287093f652fd8fd9cd7 100644
--- a/isis/src/cassini/objs/IssNACamera/IssNACamera.h
+++ b/isis/src/cassini/objs/IssNACamera/IssNACamera.h
@@ -1,41 +1,32 @@
 // $Id: IssNACamera.h,v 1.7 2009/08/31 15:12:29 slambright Exp $
 #ifndef IssNACamera_h
 #define IssNACamera_h
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "FramingCamera.h"
 
 namespace Isis {
   /**
    * @brief Cassini ISS Narrow Angle Camera Model
    *
-   *     * This is the camera model for the Cassini Imaging Science Subsystem Narrow 
-   * Angle Camera 
+   *     * This is the camera model for the Cassini Imaging Science Subsystem Narrow
+   * Angle Camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Cassini-Huygens
-   *  
-   * @see 
+   *
+   * @see
    *      http://saturn.jpl.nasa.gov/spacecraft/cassiniorbiterinstruments/instrumentscassiniiss
    * @see http://pds-imaging.jpl.nasa.gov/portal/cassini_mission.html
    * @see http://astrogeology.usgs.gov/Missions/Cassini
-   *  
+   *
    * @author  2007-07-10 Steven Koechle
    *
    * @internal
@@ -51,13 +42,13 @@ namespace Isis {
    *   @history 2009-08-28 Steven Lambright - Changed inheritance to no longer inherit directly
    *                           from Camera
    *   @history 2011-01-14 Travis Addair - Added new CK/SPK accessor methods, pure virtual in
-   *                           Camera, implemented in mission specific cameras 
+   *                           Camera, implemented in mission specific cameras
    *   @history 2011-02-09 Steven Lambright - Major changes to camera classes documentation.
    *   @history 2011-05-03 Jeannie Walldren - Added ShutterOpenCloseTimes() method. Updated
    *                           unitTest to test for new methods. Updated documentation. Replaced
-   *                           Cassini namespace wrap with Isis namespace. Added Isis Disclaimer
+   *                           Cassini namespace wrap with ISISnamespace. Added ISISDisclaimer
    *                           to files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2012-09-12 Stuart C. Sides -  Added ability for the camera to use the default
    *                           focal length if the observation was taken using a filter
@@ -65,7 +56,7 @@ namespace Isis {
    *   @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -74,37 +65,37 @@ namespace Isis {
       IssNACamera(Cube &cube);
       //! Destroys the IssNACamera object.
       ~IssNACamera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-82000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        *  SPK Center ID - 6 (Saturn)
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Center ID
        */
       virtual int SpkCenterId() const { return 6; }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/cassini/objs/IssNACamera/unitTest.cpp b/isis/src/cassini/objs/IssNACamera/unitTest.cpp
index 84f5fbb1699800ec3658a2c456f6496ccc62c83f..d6a500c9476ffbac27e8a3383259564e51690551 100644
--- a/isis/src/cassini/objs/IssNACamera/unitTest.cpp
+++ b/isis/src/cassini/objs/IssNACamera/unitTest.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 // $Id: unitTest.cpp,v 1.6 2009/01/22 22:04:55 kbecker Exp $
 #include <iomanip>
 #include <iostream>
@@ -60,11 +48,11 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
 
-    // Test Shutter Open/Close 
+
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
-    double exposureDuration = ((double) inst["ExposureDuration"])/1000; 
+    double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
     double et; // StartTime keyword is the center exposure time
     str2et_c(stime.toLatin1().data(), &et);
@@ -89,7 +77,7 @@ int main(void) {
     double line = cam->Lines() / 2.0 + 0.5;
     cout << "\nFor center pixel position ..." << endl;
     TestLineSamp(cam, samp, line);
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
diff --git a/isis/src/cassini/objs/IssWACamera/IssWACamera.cpp b/isis/src/cassini/objs/IssWACamera/IssWACamera.cpp
index b3db5880e09f190a08489460283b02adb83df1c3..2f488ca43f76652c230a79b4cc9f729da5ac38be 100644
--- a/isis/src/cassini/objs/IssWACamera/IssWACamera.cpp
+++ b/isis/src/cassini/objs/IssWACamera/IssWACamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 // $Id: IssWACamera.cpp,v 1.6 2009/08/31 15:12:29 slambright Exp $
 #include "IssWACamera.h"
 
@@ -48,7 +36,7 @@ namespace Isis {
     m_instrumentNameShort = "ISSWA";
     m_spacecraftNameLong = "Cassini Huygens";
     m_spacecraftNameShort = "Cassini";
-    
+
     NaifStatus::CheckErrors();
     Pvl &lab = *cube.label();
     PvlGroup &bandBin = lab.findGroup("BandBin", Pvl::Traverse);
@@ -99,7 +87,7 @@ namespace Isis {
     NaifStatus::CheckErrors();
   }
 
-  
+
   /**
    * Returns the shutter open and close times.  The user should pass in the
    * ExposureDuration keyword value, converted from milliseconds to seconds, and
@@ -137,7 +125,7 @@ namespace Isis {
  * @param lab Cube labels
  *
  * @return Isis::Camera* IssWACamera
- * @internal 
+ * @internal
  *   @history 2011-05-03 Jeannie Walldren - Added documentation.  Removed
  *            Cassini namespace.
  */
diff --git a/isis/src/cassini/objs/IssWACamera/IssWACamera.h b/isis/src/cassini/objs/IssWACamera/IssWACamera.h
index 48d91676b630c2fbeb567f31b865d203bef41422..1bb359ca85c2e7d9f46e5427e1723b24adaff40d 100644
--- a/isis/src/cassini/objs/IssWACamera/IssWACamera.h
+++ b/isis/src/cassini/objs/IssWACamera/IssWACamera.h
@@ -1,41 +1,32 @@
 // $Id: IssWACamera.h,v 1.7 2009/08/31 15:12:29 slambright Exp $
 #ifndef IssWACamera_h
 #define IssWACamera_h
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "FramingCamera.h"
 
 namespace Isis {
-  /** 
+  /**
    * @brief Cassini ISS Wide Angle Camera Model
    *
-   * This is the camera model for the Cassini Imaging Science Subsystem Wide 
-   * Angle Camera 
+   * This is the camera model for the Cassini Imaging Science Subsystem Wide
+   * Angle Camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Cassini-Huygens
-   *  
-   * @see 
+   *
+   * @see
    *      http://saturn.jpl.nasa.gov/spacecraft/cassiniorbiterinstruments/instrumentscassiniiss
    * @see http://pds-imaging.jpl.nasa.gov/portal/cassini_mission.html
    * @see http://astrogeology.usgs.gov/Missions/Cassini
-   *  
+   *
    * @author  2007-07-10 Steven Koechle
    *
    * @internal
@@ -59,14 +50,14 @@ namespace Isis {
    *   @history 2011-05-03 Jeannie Walldren - Added ShutterOpenCloseTimes()
    *                          method. Updated unitTest to test for new methods.
    *                          Updated documentation. Replaced Cassini namespace
-   *                          wrap with Isis namespace. Added Isis Disclaimer
+   *                          wrap with ISISnamespace. Added ISISDisclaimer
    *                          to files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
    *   @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -75,37 +66,37 @@ namespace Isis {
       IssWACamera(Cube &cube);
       //! Destroys the IssWACamera object.
       ~IssWACamera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-82000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        *  SPK Center ID - 6 (Saturn)
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Center ID
        */
       virtual int SpkCenterId() const { return 6; }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/cassini/objs/IssWACamera/unitTest.cpp b/isis/src/cassini/objs/IssWACamera/unitTest.cpp
index 19e1422737c55e79825ad5d857590f6a1890329a..4d31f0649c44c143fa54815f7ba8a728bb61b676 100644
--- a/isis/src/cassini/objs/IssWACamera/unitTest.cpp
+++ b/isis/src/cassini/objs/IssWACamera/unitTest.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 // $Id: unitTest.cpp,v 1.6 2009/01/22 22:43:29 kbecker Exp $
 #include <iomanip>
 #include <iostream>
@@ -58,11 +46,11 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
 
-    // Test Shutter Open/Close 
+
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
-    double exposureDuration = ((double) inst["ExposureDuration"])/1000; 
+    double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
     double et; // StartTime keyword is the center exposure time
     str2et_c(stime.toLatin1().data(), &et);
@@ -87,7 +75,7 @@ int main(void) {
     double line = cam->Lines() / 2.0 + 0.5;
     cout << "\nFor center pixel position ..." << endl;
     TestLineSamp(cam, samp, line);
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
diff --git a/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp b/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp
index 4b78ac01ba89577b04dba44bd5806de722cbd866..25ab7a752b076e571540555edc8ce2f1d7d21972 100644
--- a/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp
+++ b/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "VimsCamera.h"
 #include "VimsGroundMap.h"
@@ -74,7 +62,7 @@ namespace Isis {
     PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse);
     QString channel = (QString) inst ["Channel"];
 
-    //  Vims pixel pitch is not always square, but Isis does not have the ability to store
+    //  Vims pixel pitch is not always square, but ISISdoes not have the ability to store
     //  more than a single value for pixel pitch.  Member variables for pixelPitch x and y
     //  were created for proper calculation of ifov.
     if (channel == "VIS") {
diff --git a/isis/src/cassini/objs/VimsCamera/VimsCamera.h b/isis/src/cassini/objs/VimsCamera/VimsCamera.h
index b2052ef05da5c312bcbc3596568b54dff08f2490..92d09936ef9c35e7087d4216ac4a4fd697825e7c 100644
--- a/isis/src/cassini/objs/VimsCamera/VimsCamera.h
+++ b/isis/src/cassini/objs/VimsCamera/VimsCamera.h
@@ -1,25 +1,13 @@
 #ifndef VimsCamera_h
 #define VimsCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Camera.h"
 
diff --git a/isis/src/cassini/objs/VimsCamera/VimsGroundMap.cpp b/isis/src/cassini/objs/VimsCamera/VimsGroundMap.cpp
index 9e6343f329192038627879d081510f7067a812a1..eef598c4965d50ce17837327b44735e96fdc7a4b 100644
--- a/isis/src/cassini/objs/VimsCamera/VimsGroundMap.cpp
+++ b/isis/src/cassini/objs/VimsCamera/VimsGroundMap.cpp
@@ -1,23 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "VimsGroundMap.h"
 
 #include <iostream>
diff --git a/isis/src/cassini/objs/VimsCamera/VimsGroundMap.h b/isis/src/cassini/objs/VimsCamera/VimsGroundMap.h
index 0f44e3be2c2272f086b2fc0c5d5ca240cc11db5e..d1c9b52a53d0a913b823b14cc8c17c22bcbf3a16 100644
--- a/isis/src/cassini/objs/VimsCamera/VimsGroundMap.h
+++ b/isis/src/cassini/objs/VimsCamera/VimsGroundMap.h
@@ -1,27 +1,13 @@
 #ifndef VimsGroundMap_h
 #define VimsGroundMap_h
-/**
- * @file
- * $Revision: 1.6 $
- * $Date: 2009/08/07 22:08:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "CameraGroundMap.h"
 
@@ -125,7 +111,7 @@ namespace Isis {
                                       Possible values are IR or VIS */
       double p_visExp;           //!< VIS exposure duration, divided by 1000
       double p_irExp;            //!< IR exposure duration, divided by 1000
-      int    p_swathWidth;       /**< SwathWidth keyword value from the instrument group of the labels. 
+      int    p_swathWidth;       /**< SwathWidth keyword value from the instrument group of the labels.
                                       This will be image size unless occultation image */
       int    p_swathLength;      /**< SwathLength keyword value from the instrument group of the labels.
                                       This will be image size unless occultation image */
diff --git a/isis/src/cassini/objs/VimsCamera/VimsSkyMap.cpp b/isis/src/cassini/objs/VimsCamera/VimsSkyMap.cpp
index 16a7b8d3ead42265791ce515bcb78767481088cc..45d306b2ba8430652710716b19289d56cc764bcf 100644
--- a/isis/src/cassini/objs/VimsCamera/VimsSkyMap.cpp
+++ b/isis/src/cassini/objs/VimsCamera/VimsSkyMap.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "VimsSkyMap.h"
 
 #include <iostream>
diff --git a/isis/src/cassini/objs/VimsCamera/VimsSkyMap.h b/isis/src/cassini/objs/VimsCamera/VimsSkyMap.h
index c59b2a06768c916153449f7dc45e868ede7f5720..cd94374839eff4992bafcf09c52903e3e2153c10 100644
--- a/isis/src/cassini/objs/VimsCamera/VimsSkyMap.h
+++ b/isis/src/cassini/objs/VimsCamera/VimsSkyMap.h
@@ -1,27 +1,13 @@
 #ifndef VimsSkyMap_h
 #define VimsSkyMap_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2009/04/06 15:23:27 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "CameraSkyMap.h"
 
@@ -55,7 +41,7 @@ namespace Isis {
    *   @history 2013-11-18 Tracie Sucharski - Added LookDirection method to calculate unit vectors
    *                          so that old unit vector files are no longer needed.
    *   @history 2016-08-28 Kelvin Rodriguez - Removed unused member variables to squash warnings
-   *                              in clang. Part of porting to OS X 10.11 
+   *                              in clang. Part of porting to OS X 10.11
    */
   class VimsSkyMap : public CameraSkyMap {
     public:
diff --git a/isis/src/cassini/objs/VimsCamera/unitTest.cpp b/isis/src/cassini/objs/VimsCamera/unitTest.cpp
index 1492f380e3b5b51e5a05cb94ead0c001b9945ce0..1c576dfd860b2b47ed3d2ba75a46c19975582019 100644
--- a/isis/src/cassini/objs/VimsCamera/unitTest.cpp
+++ b/isis/src/cassini/objs/VimsCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 #include <vector>
@@ -46,9 +35,9 @@ void TestLineSamp(Camera *cam, double samp, double line);
  *                         calculated in code-the label keywords for Ir exposure and interline
  *                         delay is incorrect.  The camera model is also now doing calculations
  *                         in x, y, z instead of lat, lon.
- *   @history 2014-06-23 Ian Humphrey - Modified hard coded /usgs/cpkgs/ paths to 
+ *   @history 2014-06-23 Ian Humphrey - Modified hard coded /usgs/cpkgs/ paths to
  *                           relative pathnames. Fixes #2054.
- *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added tests for spacecraft and 
+ *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added tests for spacecraft and
  *                           instrument name methods.
  */
 int main(void) {
@@ -76,7 +65,7 @@ int main(void) {
     //  Tested separatedly:  Ir Normal partial field of view -none of the    C1465336166_1.ir.cub
     //      pixels' centers intersect with the ground.
     //      However, right around the bottom of pixel, samp:3 line:4 and top of samp:3 line:5 there
-    //      are some intersections, which means we can get lat/lon, but we cannot back project.          
+    //      are some intersections, which means we can get lat/lon, but we cannot back project.
     char files[5][1024] = { "$ISISTESTDATA/isis/src/cassini/unitTestData/CM_1515951157_1.ir.cub",
                             "$ISISTESTDATA/isis/src/cassini/unitTestData/CM_1514390782_1.ir.cub",
                             "$ISISTESTDATA/isis/src/cassini/unitTestData/CM_1514390782_1.vis.cub",
@@ -201,7 +190,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     //  Test a non-intersecting pixel
     double samp = 3.;
     double line = 4.;
@@ -233,7 +222,7 @@ int main(void) {
     }
 
     cout << endl;
-    
+
     // Test name methods
     cout << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -266,4 +255,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.cpp b/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.cpp
index 4d51d3d48bfd96e4ae78fd3636889ba0d6f09fe3..dc2d017ad1ee7e5c00347bfac116d34c73c7a4d8 100644
--- a/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.cpp
+++ b/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "chan1m32isis.h"
 
 #include <math.h>
diff --git a/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.h b/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.h
index d3b9d9295612cdd77188b104a4f5aeced240a21e..72495d469c9a4d4d309bafc9f9d08af9ba190ced 100644
--- a/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.h
+++ b/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.h
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #ifndef chan1m32isis_h
 #define chan1m32isis_h
 
diff --git a/isis/src/chandrayaan1/apps/chan1m32isis/main.cpp b/isis/src/chandrayaan1/apps/chan1m32isis/main.cpp
index 707aff3856ac8c1e3fa257b69b54d57fa80d08ef..bd380e71f2bfa5aa3e9ac2e11a24b31e7bfa34b2 100644
--- a/isis/src/chandrayaan1/apps/chan1m32isis/main.cpp
+++ b/isis/src/chandrayaan1/apps/chan1m32isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "chan1m32isis.h"
 #include "Application.h"
diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.cpp b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.cpp
index f7d43b0f538879e80ba7e5ea1309ef79bcec3fc4..e82256bc469c1a43f9e864c3ba1b1f289eeae7bc 100644
--- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.cpp
+++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Chandrayaan1M3Camera.h"
 
@@ -37,10 +25,10 @@ using namespace std;
 namespace Isis {
   /**
    * Constructs a Chandrayaan 1 M3 Camera object using the image labels.
-   *  
+   *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup MarsReconnaissanceOrbiter
-   *  
+   *
    * @author 2013-08-18 Stuart Sides and Tracie Sucharski
    *
    * @internal
@@ -92,7 +80,7 @@ namespace Isis {
 
 
     // Setup distortion map
-    new Chandrayaan1M3DistortionMap(this, 
+    new Chandrayaan1M3DistortionMap(this,
                                     getDouble(ppKey, 0), getDouble(ppKey, 1),
                                     getDouble(odKey, 0), getDouble(odKey, 1), getDouble(odKey, 2),
                                     getDouble(decenterKey, 0), getDouble(decenterKey, 1));
@@ -108,12 +96,12 @@ namespace Isis {
 
 
 /**
- * This is the function that is called in order to instantiate an Chandrayaan1M3Camera object. 
+ * This is the function that is called in order to instantiate an Chandrayaan1M3Camera object.
  *
  * @param lab Cube labels
  *
- * @return Isis::Camera* Chandrayaan1M3Camera 
- *  
+ * @return Isis::Camera* Chandrayaan1M3Camera
+ *
  */
 extern "C" Isis::Camera *Chandrayaan1M3CameraPlugin(Isis::Cube &cube) {
   return new Isis::Chandrayaan1M3Camera(cube);
diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.h b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.h
index bd0002c79dc68e2f6f0d3a8b226409be93b392da..6edf477d164220988d1af8bceeb507599efdee2c 100644
--- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.h
+++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.h
@@ -1,25 +1,13 @@
 #ifndef Chandrayaan1M3Camera_h
 #define Chandrayaan1M3Camera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -38,11 +26,11 @@ namespace Isis {
    *   @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    *   @history 2016-08-01 Kristin Berry - Added to unitTest to test camera model performance on
-   *                           level 2 cubes and to test RA/DEC values. References #2400. 
+   *                           level 2 cubes and to test RA/DEC values. References #2400.
    */
   class Chandrayaan1M3Camera : public LineScanCamera {
     public:
@@ -53,23 +41,23 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-86000); }
 
-      /** 
+      /**
        *  CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.cpp b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.cpp
index 50a2a815b03349a7f23676dac58574e04387f67f..6849a7d71f239abfd79c8a9ff86f55451246ac9f 100644
--- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.cpp
+++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.cpp
@@ -1,25 +1,10 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iomanip>
 
@@ -107,10 +92,10 @@ namespace Isis {
     double xdistortion, ydistortion;
     double xdistorted, ydistorted;
     double xprevious, yprevious;
-    
+
     //  dr is the radial distortion contribution
     //  dtx and dty are the decentering distortion contributions in x and y
-   
+
     xprevious = 1000000.0;
     yprevious = 1000000.0;
 
diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.h b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.h
index b563d8e6c115c362c688d7c3fb6aa61d35e274c8..f894a37ddde5d8a9d343ab0cf9b9313caef50265 100644
--- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.h
+++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.h
@@ -1,28 +1,13 @@
 #ifndef Chandrayaan1M3DistortionMap_h
 #define Chandrayaan1M3DistortionMap_h
 
-/**
- * @file
- * $Revision: 1.17 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 
 #include "Camera.h"
@@ -43,7 +28,7 @@ namespace Isis {
    * @internal
    *   @history 2013-11-24 Stuart Sides - Modified from ApolloMetricDistortionMap
    *   @history 2016-08-28 Kelvin Rodriguez - Removed unused member variable p_p3 to squash warnings
-   *                              in clang. Part of porting to OS X 10.11 
+   *                              in clang. Part of porting to OS X 10.11
    *
    */
 
diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/unitTest.cpp b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/unitTest.cpp
index 2e80942e7100343b449542ce8a9cd40c3e469ccf..8b8a22b9c50aae31c02c5c120bcd1328cf0cabf6 100644
--- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/unitTest.cpp
+++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -59,7 +48,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -103,8 +92,8 @@ int main(void) {
     }
 
     cout << "RightAscension = " << cam->RightAscension() << endl;
-    cout << "Declination = " << cam->Declination() << endl;     
-    
+    cout << "Declination = " << cam->Declination() << endl;
+
   }
   catch (IException &e) {
     e.print();
@@ -132,4 +121,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/clementine/apps/clem2isis/bitstrm.cpp b/isis/src/clementine/apps/clem2isis/bitstrm.cpp
index 9b2f565e1c7e134746c6b11d5223087eec756c88..27a50ec1289677e90865deac854b961c091edb0f 100644
--- a/isis/src/clementine/apps/clem2isis/bitstrm.cpp
+++ b/isis/src/clementine/apps/clem2isis/bitstrm.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 /*
  *      THIS ROUTINE IS PART OF THE CLEMENTINE PDS FILE READER PROGRAM.
  *      IT WAS WRITTEN BY ACT CORP. IN DIRECT SUPPORT TO THE
diff --git a/isis/src/clementine/apps/clem2isis/decomp.cpp b/isis/src/clementine/apps/clem2isis/decomp.cpp
index 10c05261e9ff727303abc15a85de477ab9a9087b..e928c1a8c7ec7af384cc88499123c5753084aabb 100644
--- a/isis/src/clementine/apps/clem2isis/decomp.cpp
+++ b/isis/src/clementine/apps/clem2isis/decomp.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 /*
  *      THIS ROUTINE IS PART OF THE CLEMENTINE PDS FILE READER PROGRAM.
  *      IT WAS WRITTEN BY ACT CORP. IN DIRECT SUPPORT TO THE
diff --git a/isis/src/clementine/apps/clem2isis/huffman.cpp b/isis/src/clementine/apps/clem2isis/huffman.cpp
index 51ef4efbbeb4ae7a522fa8eade195c5cfc0bd81b..0bef18e34073e2b4fc6c01bdd17033ea14fc537b 100644
--- a/isis/src/clementine/apps/clem2isis/huffman.cpp
+++ b/isis/src/clementine/apps/clem2isis/huffman.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 /*
  *      THIS ROUTINE IS PART OF THE CLEMENTINE PDS FILE READER PROGRAM.
  *      IT WAS WRITTEN BY ACT CORP. IN DIRECT SUPPORT TO THE
diff --git a/isis/src/clementine/apps/clem2isis/jpeg_c.h b/isis/src/clementine/apps/clem2isis/jpeg_c.h
index 1aeaeb79db5e7c38f1f2d6891f41ae0f8349c593..205f3b14d22ed7e79b80c40dae16ff29c8e7fb47 100644
--- a/isis/src/clementine/apps/clem2isis/jpeg_c.h
+++ b/isis/src/clementine/apps/clem2isis/jpeg_c.h
@@ -1,6 +1,14 @@
 #ifndef jpeg_c_h
 #define jpeg_c_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 /* Structure Definitions */
 enum FmodeDef { INPUT, OUTPUT };
 typedef enum FmodeDef Fmode;
diff --git a/isis/src/clementine/apps/clem2isis/main.cpp b/isis/src/clementine/apps/clem2isis/main.cpp
index e7a03a6bb3e065164fac7331a813b450e6bb5408..6e7435f82f9e1663395b06b52bc4423cb8eb2eef 100755
--- a/isis/src/clementine/apps/clem2isis/main.cpp
+++ b/isis/src/clementine/apps/clem2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
@@ -91,7 +99,7 @@ void writeLine(Buffer &b) {
  *  Function to propagate the labels.
  *
  *  @internal
- *    @history 2009-02-17 Tracie Sucharski - Added BandBin keywords Center and 
+ *    @history 2009-02-17 Tracie Sucharski - Added BandBin keywords Center and
  *                            Width to the translation table, Clementine.trn.  Do not alter this
  *                            keywords for filter F, simply translate.
  *
diff --git a/isis/src/clementine/apps/clem2isis/pds.cpp b/isis/src/clementine/apps/clem2isis/pds.cpp
index aa922307ef7a18662f3504b0869559e7953e75d0..659f72550d32a30bf7b401d23ffb89bf06950cb8 100644
--- a/isis/src/clementine/apps/clem2isis/pds.cpp
+++ b/isis/src/clementine/apps/clem2isis/pds.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 /*
  *      THIS ROUTINE IS PART OF THE CLEMENTINE PDS FILE READER PROGRAM.
  *      IT WAS WRITTEN BY ACT CORP. IN DIRECT SUPPORT TO THE
@@ -532,4 +540,3 @@ void PCshort2SUNshortVector(unsigned short invec[], int npts) {
   }
 }
 #endif
-
diff --git a/isis/src/clementine/apps/clem2isis/pds.h b/isis/src/clementine/apps/clem2isis/pds.h
index 79d316f7d4eee5dbadb19344d82839258538da17..f063ac29887e91db34405a7fb8ed1f38ef610209 100644
--- a/isis/src/clementine/apps/clem2isis/pds.h
+++ b/isis/src/clementine/apps/clem2isis/pds.h
@@ -1,6 +1,14 @@
 #ifndef pds_h
 #define pds_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #if defined(__BORLANDC__) && !defined(__WIN32__)
 #define CHARH   unsigned char huge
 #else
diff --git a/isis/src/clementine/apps/clemhirescal/main.cpp b/isis/src/clementine/apps/clemhirescal/main.cpp
index 157abfba28eca16a935c2d42f76706199df6ff16..ecdbec63065eadd286cc790b6afd5dda4e640d0e 100644
--- a/isis/src/clementine/apps/clemhirescal/main.cpp
+++ b/isis/src/clementine/apps/clemhirescal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Cube.h"
diff --git a/isis/src/clementine/apps/clemnircal/main.cpp b/isis/src/clementine/apps/clemnircal/main.cpp
index 9a1d43dce8c41f137cc5b38ea0ad0b3382a010c2..1ca06312f1b72291cfb629b819f15725157453b0 100644
--- a/isis/src/clementine/apps/clemnircal/main.cpp
+++ b/isis/src/clementine/apps/clemnircal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "Pixel.h"
diff --git a/isis/src/clementine/apps/clemnirclean/main.cpp b/isis/src/clementine/apps/clemnirclean/main.cpp
index 59a1b68bc63fdb8d1ca401581c7edf6618f9ac68..3c434ce9586249ec99ef1a89949471fdc86d482d 100644
--- a/isis/src/clementine/apps/clemnirclean/main.cpp
+++ b/isis/src/clementine/apps/clemnirclean/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
@@ -20,47 +28,47 @@ void IsisMain() {
   p.AddToPipeline("noisefilter", "noisefilter1");
   p.Application("noisefilter1").SetInputParameter("FROM", true);
   p.Application("noisefilter1").SetOutputParameter("TO", "box1");
-  p.Application("noisefilter1").AddConstParameter("toldef", "stddev"); 
-  p.Application("noisefilter1").AddConstParameter("tolmin", "1.25"); 
-  p.Application("noisefilter1").AddConstParameter("tolmax", "1.25"); 
-  p.Application("noisefilter1").AddConstParameter("samples", "3"); 
-  p.Application("noisefilter1").AddConstParameter("lines", "3"); 
-  p.Application("noisefilter1").AddConstParameter("replace", "null"); 
+  p.Application("noisefilter1").AddConstParameter("toldef", "stddev");
+  p.Application("noisefilter1").AddConstParameter("tolmin", "1.25");
+  p.Application("noisefilter1").AddConstParameter("tolmax", "1.25");
+  p.Application("noisefilter1").AddConstParameter("samples", "3");
+  p.Application("noisefilter1").AddConstParameter("lines", "3");
+  p.Application("noisefilter1").AddConstParameter("replace", "null");
 
   // Run lowpass on the cube using outside filter, 3x3 boxcar
   p.AddToPipeline("lowpass", "lowpass1");
   p.Application("lowpass1").SetInputParameter("FROM", true);
   p.Application("lowpass1").SetOutputParameter("TO", "box2");
-  p.Application("lowpass1").AddConstParameter("samples", "3"); 
-  p.Application("lowpass1").AddConstParameter("lines", "3"); 
-  p.Application("lowpass1").AddConstParameter("filter", "outside"); 
+  p.Application("lowpass1").AddConstParameter("samples", "3");
+  p.Application("lowpass1").AddConstParameter("lines", "3");
+  p.Application("lowpass1").AddConstParameter("filter", "outside");
 
   // Run lowpass on the cube using outside filter, 3x3 boxcar
   p.AddToPipeline("lowpass", "lowpass2");
   p.Application("lowpass2").SetInputParameter("FROM", true);
   p.Application("lowpass2").SetOutputParameter("TO", "box3");
-  p.Application("lowpass2").AddConstParameter("samples", "3"); 
-  p.Application("lowpass2").AddConstParameter("lines", "3"); 
-  p.Application("lowpass2").AddConstParameter("filter", "outside"); 
+  p.Application("lowpass2").AddConstParameter("samples", "3");
+  p.Application("lowpass2").AddConstParameter("lines", "3");
+  p.Application("lowpass2").AddConstParameter("filter", "outside");
 
   // Run lowpass on the cube using outside filter, 3x3 boxcar
   p.AddToPipeline("noisefilter", "noisefilter2");
   p.Application("noisefilter2").SetInputParameter("FROM", true);
   p.Application("noisefilter2").SetOutputParameter("TO", "box4");
-  p.Application("noisefilter2").AddConstParameter("toldef", "stddev"); 
-  p.Application("noisefilter2").AddConstParameter("tolmin", "1.5"); 
-  p.Application("noisefilter2").AddConstParameter("tolmax", "1.5"); 
-  p.Application("noisefilter2").AddConstParameter("samples", "3"); 
-  p.Application("noisefilter2").AddConstParameter("lines", "3"); 
+  p.Application("noisefilter2").AddConstParameter("toldef", "stddev");
+  p.Application("noisefilter2").AddConstParameter("tolmin", "1.5");
+  p.Application("noisefilter2").AddConstParameter("tolmax", "1.5");
+  p.Application("noisefilter2").AddConstParameter("samples", "3");
+  p.Application("noisefilter2").AddConstParameter("lines", "3");
   p.Application("noisefilter2").AddConstParameter("nullisnoise", "yes");
 
   // Run lowpass on the cube using outside filter, 3x3 boxcar
   p.AddToPipeline("lowpass", "lowpass3");
   p.Application("lowpass3").SetInputParameter("FROM", true);
   p.Application("lowpass3").SetOutputParameter("TO", "box5");
-  p.Application("lowpass3").AddConstParameter("samples", "5"); 
-  p.Application("lowpass3").AddConstParameter("lines", "5"); 
-  p.Application("lowpass3").AddConstParameter("filter", "outside"); 
+  p.Application("lowpass3").AddConstParameter("samples", "5");
+  p.Application("lowpass3").AddConstParameter("lines", "5");
+  p.Application("lowpass3").AddConstParameter("filter", "outside");
 
   p.Run();
 }
diff --git a/isis/src/clementine/apps/clemnirnoise/main.cpp b/isis/src/clementine/apps/clemnirnoise/main.cpp
index 8ecdee6079195ed8994c2f2296cb7adb51534d5a..fb862dd09b44d43cef46ff5cee2a69dc513df36f 100644
--- a/isis/src/clementine/apps/clemnirnoise/main.cpp
+++ b/isis/src/clementine/apps/clemnirnoise/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cmath>
diff --git a/isis/src/clementine/apps/clemuvviscal/main.cpp b/isis/src/clementine/apps/clemuvviscal/main.cpp
index d6e18ab220b68cf93a168ab4877af38c7524a8b8..1df043e9dc233f5fa6246dd72cefa9e9dfcaef92 100644
--- a/isis/src/clementine/apps/clemuvviscal/main.cpp
+++ b/isis/src/clementine/apps/clemuvviscal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cmath>
diff --git a/isis/src/clementine/objs/HiresCamera/HiresCamera.cpp b/isis/src/clementine/objs/HiresCamera/HiresCamera.cpp
index d44889860424668f765713ead404bd902b950699..75cdfaf3a6b97b5342e22f1e8c6602b1b653c8cd 100644
--- a/isis/src/clementine/objs/HiresCamera/HiresCamera.cpp
+++ b/isis/src/clementine/objs/HiresCamera/HiresCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "HiresCamera.h"
 
@@ -44,14 +32,14 @@ namespace Isis {
    *                          call to ShutterOpenCloseTimes() method. Changed
    *                          centertime to add half exposure duration to start
    *                          time to maintain consistency with other Clementine
-   *                          models. 
+   *                          models.
    */
   HiresCamera::HiresCamera(Cube &cube) : FramingCamera(cube) {
     m_instrumentNameLong = "High Resolution Camera";
     m_instrumentNameShort = "HiRES";
     m_spacecraftNameLong = "Clementine 1";
     m_spacecraftNameShort = "Clementine1";
-    
+
     NaifStatus::CheckErrors();
     Pvl &lab = *cube.label();
     // Get the camera characteristics
@@ -76,7 +64,7 @@ namespace Isis {
      * clementine camera models. Not sure why the following was originally
      * commented out:
      * 2010-08-05 Jeannie Walldren
-     ***********************************************************************/ 
+     ***********************************************************************/
     // Do not correct time for center of the exposure duration. This is because
     // the kernels were built to accept the start times of the images.
     iTime centerTime = shuttertimes.first.Et() + exposureDuration / 2.0;
@@ -142,7 +130,7 @@ namespace Isis {
  * @param lab Cube labels
  *
  * @return Isis::Camera* HiresCamera
- * @internal 
+ * @internal
  *   @history 2011-05-03 Jeannie Walldren - Added documentation.  Removed
  *            Clementine namespace.
  */
diff --git a/isis/src/clementine/objs/HiresCamera/HiresCamera.h b/isis/src/clementine/objs/HiresCamera/HiresCamera.h
index f9d84f089046c63d0d1e873ec1eb73e2f9047f58..4d5e35f8fde012a5300a76a4ec57313b98881756 100644
--- a/isis/src/clementine/objs/HiresCamera/HiresCamera.h
+++ b/isis/src/clementine/objs/HiresCamera/HiresCamera.h
@@ -1,24 +1,13 @@
 #ifndef HiresCamera_h
 #define HiresCamera_h
-/**
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -28,17 +17,17 @@ namespace Isis {
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Clementine
-   *  
-   * @see 
+   *
+   * @see
    *      http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/sensors/hires/hires.html
-   * @see 
+   * @see
    *      http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/clemhome.html
-   * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html 
+   * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html
    * @see http://astrogeology.usgs.gov/Missions/Clementine
    *
    * @author  2009-01-16 Tracie Sucharski
    *
-   * @internal 
+   * @internal
    *   @history 2009-01-21 Tracie Sucharski - Original version
    *   @history 2009-08-28 Steven Lambright - Changed inheritance to no longer
    *                           inherit directly from Camera.  Camera is now pure
@@ -56,12 +45,12 @@ namespace Isis {
    *                           constructor. Changed centertime in constructor to
    *                           add half exposure duration to start time to
    *                           maintain consistency with other Clementine models.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -70,28 +59,28 @@ namespace Isis {
       HiresCamera(Cube &cube);
       //! Destroys the HiresCamera object.
       ~HiresCamera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-40000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/clementine/objs/HiresCamera/unitTest.cpp b/isis/src/clementine/objs/HiresCamera/unitTest.cpp
index 9505cdfb6daba0b71af8d36d553c65f90d323846..a41cf3ba17213ae03621d71435ed4c318d710679 100644
--- a/isis/src/clementine/objs/HiresCamera/unitTest.cpp
+++ b/isis/src/clementine/objs/HiresCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -59,7 +48,7 @@ int main(void) {
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
@@ -104,7 +93,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -137,4 +126,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/clementine/objs/LwirCamera/LwirCamera.cpp b/isis/src/clementine/objs/LwirCamera/LwirCamera.cpp
index e62819a82870c37370bcc9bccfa000a10689ae1a..4a302ca216e766b1eba13325e5faa6c13bf7edc0 100644
--- a/isis/src/clementine/objs/LwirCamera/LwirCamera.cpp
+++ b/isis/src/clementine/objs/LwirCamera/LwirCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LwirCamera.h"
 
diff --git a/isis/src/clementine/objs/LwirCamera/LwirCamera.h b/isis/src/clementine/objs/LwirCamera/LwirCamera.h
index a72fe386c7eedaa8ab326efba9df6d0c295d2d34..d7516feaa8f2b2d0d43b24e661d123c193aa5212 100644
--- a/isis/src/clementine/objs/LwirCamera/LwirCamera.h
+++ b/isis/src/clementine/objs/LwirCamera/LwirCamera.h
@@ -1,24 +1,13 @@
 #ifndef LwirCamera_h
 #define LwirCamera_h
-/**
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -28,12 +17,12 @@ namespace Isis {
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Clementine
-   *  
-   * @see 
+   *
+   * @see
    *      http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/sensors/lwir/lwir.html
-   * @see 
+   * @see
    *      http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/clemhome.html
-   * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html 
+   * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html
    * @see http://astrogeology.usgs.gov/Missions/Clementine
    *
    * @author  2009-01-16 Jeannie Walldren
@@ -56,12 +45,12 @@ namespace Isis {
    *                           constructor. Changed centertime in constructor to
    *                           add half exposure duration to start time to
    *                           maintain consistency with other Clementine models.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -75,23 +64,23 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-40000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/clementine/objs/LwirCamera/unitTest.cpp b/isis/src/clementine/objs/LwirCamera/unitTest.cpp
index 4062cc3d93ff68a55151db794456c5b707bac404..972b229d0573ba84ae0fe88bc3d9795d47c0c4d2 100644
--- a/isis/src/clementine/objs/LwirCamera/unitTest.cpp
+++ b/isis/src/clementine/objs/LwirCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -59,7 +48,7 @@ int main(void) {
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
@@ -104,7 +93,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownCenterLon << endl;
     }
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -137,4 +126,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/clementine/objs/NirCamera/NirCamera.cpp b/isis/src/clementine/objs/NirCamera/NirCamera.cpp
index 3f8ffc60f1040d31ea78eb1512bce33c4e36c99b..dd04a3bb3c1ebcc87c171a55d376330cc8f7e7b1 100644
--- a/isis/src/clementine/objs/NirCamera/NirCamera.cpp
+++ b/isis/src/clementine/objs/NirCamera/NirCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "NirCamera.h"
 
 #include <QString>
@@ -50,7 +39,7 @@ namespace Isis {
     m_instrumentNameShort = "NIR";
     m_spacecraftNameLong = "Clementine 1";
     m_spacecraftNameShort = "Clementine1";
-    
+
     NaifStatus::CheckErrors();
     // Get the camera characteristics
 
diff --git a/isis/src/clementine/objs/NirCamera/NirCamera.h b/isis/src/clementine/objs/NirCamera/NirCamera.h
index b00e3b4acd844eba3c0d64867745072212257424..53cf085e404c3b5adc7bba0b3c95762e7e7fa06c 100644
--- a/isis/src/clementine/objs/NirCamera/NirCamera.h
+++ b/isis/src/clementine/objs/NirCamera/NirCamera.h
@@ -1,41 +1,30 @@
 #ifndef NirCamera_h
 #define NirCamera_h
-/**
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
 namespace Isis {
   /**
-   * This is the camera model for the Clementine Near Infrared Camera 
+   * This is the camera model for the Clementine Near Infrared Camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Clementine
-   *  
-   * @see 
+   *
+   * @see
    *      http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/sensors/nir/nir.html
-   * @see 
+   * @see
    *      http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/clemhome.html
-   * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html 
+   * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html
    * @see http://astrogeology.usgs.gov/Missions/Clementine
-   *      
+   *
    * @author  2007-07-10 Steven Lambright
    *
    * @internal
@@ -63,12 +52,12 @@ namespace Isis {
    *                           constructor. Changed centertime in constructor to
    *                           add half exposure duration to start time to
    *                           maintain consistency with other Clementine models.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -77,28 +66,28 @@ namespace Isis {
       NirCamera(Cube &cube);
       //! Destroys the NirCamera object
       ~NirCamera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-40000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/clementine/objs/NirCamera/unitTest.cpp b/isis/src/clementine/objs/NirCamera/unitTest.cpp
index 53f961447534a1c2e6ace6b86bfb9ebfdb4be464..1f85ad0bdae01f8548363b702d4e5134434332cc 100644
--- a/isis/src/clementine/objs/NirCamera/unitTest.cpp
+++ b/isis/src/clementine/objs/NirCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -59,7 +48,7 @@ int main(void) {
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
@@ -104,7 +93,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -137,4 +126,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.cpp b/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.cpp
index 047eb050fe432862b841bf4f781d4697061d17a5..680bf9a78d47b1274fc029d0448fb14bfb271ea9 100755
--- a/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.cpp
+++ b/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.cpp
@@ -1,25 +1,10 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iomanip>
 
@@ -29,22 +14,22 @@
 using namespace std;
 
 namespace Isis {
-  /** 
-   * Construct a distortion map for the Clementine UVVIS instrument. 
-   *  
-   * @param parent Camera object corresponding to this distortion map. 
+  /**
+   * Construct a distortion map for the Clementine UVVIS instrument.
+   *
+   * @param parent Camera object corresponding to this distortion map.
    * @param xp The x coordinate for the principal point offset.
-   * @param yp The y coordinate for the principal point offset. 
-   * @param k1 The constant term coefficient for the radial distortion 
+   * @param yp The y coordinate for the principal point offset.
+   * @param k1 The constant term coefficient for the radial distortion
    *           contribution polynomial.
-   * @param k2 The linear term coefficient for the radial distortion 
+   * @param k2 The linear term coefficient for the radial distortion
    *           contribution polynomial.
-   * @param k3 The quadratic term coefficient for the radial distortion 
+   * @param k3 The quadratic term coefficient for the radial distortion
    *           contribution polynomial.
    * @param p1 First decentering distortion term.
    * @param p2 Second decentering distortion term.
-   *  
-   */ 
+   *
+   */
   ClementineUvvisDistortionMap::ClementineUvvisDistortionMap(Camera *parent,
                                                              double xp, double yp,
                                                              double k1, double k2, double k3,
@@ -62,9 +47,9 @@ namespace Isis {
   }
 
 
-  /** 
-   * Deconstruct the distortion map for the Clementine UVVIS instrument. 
-   */ 
+  /**
+   * Deconstruct the distortion map for the Clementine UVVIS instrument.
+   */
   ClementineUvvisDistortionMap::~ClementineUvvisDistortionMap() {
   }
 
@@ -132,10 +117,10 @@ namespace Isis {
     double xdistortion, ydistortion;
     double xdistorted, ydistorted;
     double xprevious, yprevious;
-    
+
     //  dr is the radial distortion contribution
     //  dtx and dty are the decentering distortion contributions in x and y
-   
+
     xprevious = 1000000.0;
     yprevious = 1000000.0;
 
diff --git a/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.h b/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.h
index 78453cb8c6f3950a4bc2708817860284c62d982e..ec4dc4ae4eb7956b70783aa2b8f0a36db0f1c62c 100644
--- a/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.h
+++ b/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.h
@@ -1,29 +1,13 @@
 #ifndef ClementineUvvisDistortionMap_h
 #define ClementineUvvisDistortionMap_h
 
-/**
- * @file
- * $Revision: 1.17 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
 
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Camera.h"
 #include "CameraDistortionMap.h"
diff --git a/isis/src/clementine/objs/UvvisCamera/UvvisCamera.cpp b/isis/src/clementine/objs/UvvisCamera/UvvisCamera.cpp
index 2e8189e6e47f119d5aa4d449d6e287143602c6fe..7c7f73e1eaf2a74419c9ec445b40460c55a1317d 100755
--- a/isis/src/clementine/objs/UvvisCamera/UvvisCamera.cpp
+++ b/isis/src/clementine/objs/UvvisCamera/UvvisCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "UvvisCamera.h"
 
@@ -36,10 +24,10 @@ using namespace std;
 namespace Isis {
   /**
    * Constructs a Clementine UV/VIS Model using the image labels.
-   *  
-   * @param lab Pvl label from a Clementine UVVIS image. 
-   *  
-   * @internal 
+   *
+   * @param lab Pvl label from a Clementine UVVIS image.
+   *
+   * @internal
    *   @history 2011-05-03 Jeannie Walldren - Added NAIF error check.  Added
    *                          call to ShutterOpenCloseTimes() method.
    */
@@ -48,7 +36,7 @@ namespace Isis {
     m_instrumentNameShort = "UVVIS";
     m_spacecraftNameLong = "Clementine 1";
     m_spacecraftNameShort = "Clementine1";
-    
+
     NaifStatus::CheckErrors();
     // Get the camera characteristics
     SetFocalLength();
@@ -74,9 +62,9 @@ namespace Isis {
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
 
     focalMap->SetDetectorOrigin(
-      Spice::getDouble("INS" + toString(naifIkCode()) + 
+      Spice::getDouble("INS" + toString(naifIkCode()) +
                        "_BORESIGHT_SAMPLE"),
-      Spice::getDouble("INS" + toString(naifIkCode()) + 
+      Spice::getDouble("INS" + toString(naifIkCode()) +
                        "_BORESIGHT_LINE"));
 
     QString ppKey("INS" + toString(naifIkCode()) + "_PP");
@@ -84,7 +72,7 @@ namespace Isis {
     QString decenterKey("INS" + toString(naifIkCode()) + "_DECENTER");
 
     // Setup distortion map
-    new ClementineUvvisDistortionMap(this, 
+    new ClementineUvvisDistortionMap(this,
                                     getDouble(ppKey, 0), getDouble(ppKey, 1),
                                     getDouble(odKey, 0), getDouble(odKey, 1), getDouble(odKey, 2),
                                     getDouble(decenterKey, 0), getDouble(decenterKey, 1));
@@ -137,7 +125,7 @@ namespace Isis {
  * @param lab Cube labels
  *
  * @return Isis::Camera* UvvisCamera
- * @internal 
+ * @internal
  *   @history 2011-05-03 Jeannie Walldren - Added documentation.  Removed
  *            Clementine namespace.
  */
diff --git a/isis/src/clementine/objs/UvvisCamera/UvvisCamera.h b/isis/src/clementine/objs/UvvisCamera/UvvisCamera.h
index 0b9013622198662eeff3db79f0eed2bf5b439c98..d752b6da63ee15dddac1f539cae42a172c754900 100644
--- a/isis/src/clementine/objs/UvvisCamera/UvvisCamera.h
+++ b/isis/src/clementine/objs/UvvisCamera/UvvisCamera.h
@@ -1,41 +1,30 @@
 #ifndef UvvisCamera_h
 #define UvvisCamera_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
 namespace Isis {
   /**
-   * This is the camera model for the Clementine Ultraviolet/Visible Camera 
+   * This is the camera model for the Clementine Ultraviolet/Visible Camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Clementine
-   *  
-   * @see 
+   *
+   * @see
    *      http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/sensors/uvvis/uvvis.html
-   * @see 
+   * @see
    *      http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/clemhome.html
-   * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html 
+   * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html
    * @see http://astrogeology.usgs.gov/Missions/Clementine
-   *  
+   *
    * @author  2007-07-10 Tracie Sucharski
    *
    * @internal
@@ -64,12 +53,12 @@ namespace Isis {
    *                           namespace wrap with Isis namespace. Added Isis
    *                           Disclaimer to files. Added NAIF error check to
    *                           constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    *   @history 2017-12-27 Jeff Anderson & Victor Silva - Added instrument specific distortion
@@ -82,28 +71,28 @@ namespace Isis {
       UvvisCamera(Cube &cube);
       //! Destroys the UvvisCamera object.
       ~UvvisCamera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-40000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/clementine/objs/UvvisCamera/unitTest.cpp b/isis/src/clementine/objs/UvvisCamera/unitTest.cpp
index 33f7179d5c871b30aff9e55233e888c7116e2ed1..742319f655cdecd2bda5f332cf8347b6667db637 100644
--- a/isis/src/clementine/objs/UvvisCamera/unitTest.cpp
+++ b/isis/src/clementine/objs/UvvisCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -64,7 +53,7 @@ int main(void) {
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
@@ -109,7 +98,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
diff --git a/isis/src/clipper/apps/eis2isis/main.cpp b/isis/src/clipper/apps/eis2isis/main.cpp
index 3eaa4e11a38c409b4bd95b15acec10eefc3e5af3..fa1fd8fcde0fff8f299259442419eb1681175172 100644
--- a/isis/src/clipper/apps/eis2isis/main.cpp
+++ b/isis/src/clipper/apps/eis2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "CSVReader.h"
diff --git a/isis/src/clipper/apps/jitterfit/main.cpp b/isis/src/clipper/apps/jitterfit/main.cpp
index 4ace5f5ec4698ecd179485761472d7036e8cd191..2df543678abfe532a6f30abfb66a49a442ed7a3e 100644
--- a/isis/src/clipper/apps/jitterfit/main.cpp
+++ b/isis/src/clipper/apps/jitterfit/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <iostream>
@@ -35,17 +43,17 @@ struct RegistrationData {
 };
 
 void IsisMain() {
-  
+
   bool registrationFileSpecified = false;
-  
+
   UserInterface &ui = Application::GetUserInterface();
-  
+
   Cube jitterCube;
   jitterCube.open(ui.GetFileName("FROM"), "rw");
-  
+
   Cube checkCube;
   checkCube.open(ui.GetFileName("FROM2"), "r");
-  
+
   Pvl defFile;
   defFile.read(ui.GetFileName("DEFFILE"));
   AutoReg *ar = AutoRegFactory::Create(defFile);
@@ -69,35 +77,35 @@ void IsisMain() {
   // ???? Question: Why use a file name here? Can't Table/blob read from an open Cube?
   Table mainReadouts(QString("Normalized Main Readout Line Times"), jitterCube.fileName());
   Table checklineReadouts(QString("Normalized Checkline Readout Line Times"), checkCube.fileName());
-  
-  // Register each check line to the area near the corrisponding main image line using the 
+
+  // Register each check line to the area near the corrisponding main image line using the
   // registration definition file
   QList<RegistrationData> registrationData;
   for (int k = 0; k < checkCube.lineCount(); k++) {
-    
+
     int checklineLine = checklineReadouts[k][0];
     int mainLine = mainReadouts[checklineLine][0];
-    
+
     int sample = (int)(pointSpacing / 2.0 + 0.5);
-    
-    ar->PatternChip()->TackCube(sample, k + 1); 
+
+    ar->PatternChip()->TackCube(sample, k + 1);
     ar->PatternChip()->Load(checkCube);
-    
+
     ar->SearchChip()->TackCube(sample, checklineLine * scale); // The checkline will correspond to the line number that the checkCube was taken at
     ar->SearchChip()->Load(jitterCube);
-    
+
     ar->Register();
-    
+
     if (registrationFileSpecified) {
-      outputFile << checklineLine << "," << sample/scale << "," << 
-                    std::setprecision(14) << double(checklineReadouts[k][1]) << "," << 
-                    ar->CubeLine()/scale << "," << ar->CubeSample()/scale << ","  << 
-                    double(mainReadouts[mainLine][1]) << "," << 
-                    checklineLine - ar->CubeLine()/scale << "," << 
-                    sample/scale - ar->CubeSample()/scale << "," << 
+      outputFile << checklineLine << "," << sample/scale << "," <<
+                    std::setprecision(14) << double(checklineReadouts[k][1]) << "," <<
+                    ar->CubeLine()/scale << "," << ar->CubeSample()/scale << ","  <<
+                    double(mainReadouts[mainLine][1]) << "," <<
+                    checklineLine - ar->CubeLine()/scale << "," <<
+                    sample/scale - ar->CubeSample()/scale << "," <<
                     ar->GoodnessOfFit() << "," << ar->Success() << endl;
     }
-    
+
     RegistrationData checkLineRegistration;
     checkLineRegistration.checkLine = checklineLine;
     checkLineRegistration.checkSample = sample/scale;
@@ -148,12 +156,12 @@ void IsisMain() {
     if (checkLineRow.goodness >= tolerance) {
 
       /* Normalization Equation
-       * 
-       * a = min of scale 
+       *
+       * a = min of scale
        * b = max of scale
-       * 
-       * ((b - a)(x - min(x)) / (max(x) - min(x))) + a 
-       * 
+       *
+       * ((b - a)(x - min(x)) / (max(x) - min(x))) + a
+       *
        * We're normalizing from -1 to 1 so the equation below is simplified
        */
 
@@ -175,9 +183,9 @@ void IsisMain() {
   outputCoefficientFile.open(coefficientTo.toLatin1().data());
   outputCoefficientFile << "# Line, Sample" << endl;
 
-  PvlKeyword &jitterLineCoefficients = 
+  PvlKeyword &jitterLineCoefficients =
       jitterCube.label()->findKeyword("JitterLineCoefficients", PvlObject::Traverse);
-  PvlKeyword &jitterSampleCoefficients = 
+  PvlKeyword &jitterSampleCoefficients =
       jitterCube.label()->findKeyword("JitterSampleCoefficients", PvlObject::Traverse);
 
   for (int i = 0; i < degree; i++) {
@@ -216,12 +224,12 @@ void IsisMain() {
         solvedSample = solvedSample + sampleFunction->Coefficient(k) * pow(checkLineRow.matchedTime, k+1);
       }
 
-      outputResidualFile << std::setprecision(14) << checkLineRow.matchedLine << "," << 
+      outputResidualFile << std::setprecision(14) << checkLineRow.matchedLine << "," <<
                             std::setprecision(14) << checkLineRow.checkLine - solvedLine << "," <<
-                            std::setprecision(14) << lsqLine.Residual(i) << "," << 
-                            std::setprecision(14) << checkLineRow.matchedSample << "," << 
-                            std::setprecision(14) << checkLineRow.checkSample - solvedSample << "," << 
-                            std::setprecision(14) << lsqSample.Residual(i) << "," << 
+                            std::setprecision(14) << lsqLine.Residual(i) << "," <<
+                            std::setprecision(14) << checkLineRow.matchedSample << "," <<
+                            std::setprecision(14) << checkLineRow.checkSample - solvedSample << "," <<
+                            std::setprecision(14) << lsqSample.Residual(i) << "," <<
                             std::setprecision(14) << checkLineRow.matchedTime << endl;
     }
 
diff --git a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.cpp b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.cpp
index bd6b5cb5a27813d2f5b4e9c71619803973c29495..db2c9a1eae04102477ec4f5f543c52b6550ba792 100644
--- a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.cpp
+++ b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.cpp
@@ -1,23 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "ClipperNacRollingShutterCamera.h"
 
@@ -43,7 +30,7 @@ namespace Isis {
    *
    * @param Cube &cube Clipper EIS image.
    */
-  ClipperNacRollingShutterCamera::ClipperNacRollingShutterCamera(Cube &cube) : 
+  ClipperNacRollingShutterCamera::ClipperNacRollingShutterCamera(Cube &cube) :
     RollingShutterCamera(cube) {
 
     m_spacecraftNameLong = "Europa Clipper";
@@ -62,34 +49,34 @@ namespace Isis {
 
     // Set up start time and exposure duration
     QString startTime = inst["StartTime"];
-    iTime etStart(startTime); 
+    iTime etStart(startTime);
 
     // Use to calculate center time when exposure duration is available
     // double exposureDuration = ((double) inst["ExposureDuration"]);
 
     // Grab the coefficients for the polynomial that fit the jitter and the normal readout times of
     // the lines of the image
-    
-    // The two keywords and table below are _all_ required for remove/addJitter in the 
+
+    // The two keywords and table below are _all_ required for remove/addJitter in the
     // RollingShutterCameraDetectorMap to work. If any are missing, just leave the below arrays
-    //  unitialized, and add/removeJitter will default to 0. 
+    //  unitialized, and add/removeJitter will default to 0.
 
     std::vector<double> sampleCoeffs, lineCoeffs, readoutTimes;
 
     if ( (inst.hasKeyword("JitterSampleCoefficients") && inst.hasKeyword("JitterLineCoefficients") )
         && cube.hasTable("Normalized Main Readout Line Times")) {
-      PvlKeyword sampleCoefficients = inst.findKeyword("JitterSampleCoefficients"); 
+      PvlKeyword sampleCoefficients = inst.findKeyword("JitterSampleCoefficients");
       for (int i = 0; i < sampleCoefficients.size(); i++) {
         sampleCoeffs.push_back(sampleCoefficients[i].toDouble());
       }
-      
+
       PvlKeyword lineCoefficients = inst.findKeyword("JitterLineCoefficients");
       for (int i = 0; i < lineCoefficients.size(); i++) {
         lineCoeffs.push_back(lineCoefficients[i].toDouble());
       }
-      
-      Table normalizedReadoutTimes("Normalized Main Readout Line Times", lab.fileName(), lab); 
-      
+
+      Table normalizedReadoutTimes("Normalized Main Readout Line Times", lab.fileName(), lab);
+
       for (int i = 0; i < normalizedReadoutTimes.Records(); i++) {
         TableRecord record = normalizedReadoutTimes[i];
         readoutTimes.push_back((double) record["time"]);
@@ -109,7 +96,7 @@ namespace Isis {
     new CameraGroundMap(this);
     new CameraSkyMap(this);
 
-    setTime(etStart.Et()); // Consider changing to center in future. 
+    setTime(etStart.Et()); // Consider changing to center in future.
     LoadCache();
     NaifStatus::CheckErrors();
   }
@@ -135,7 +122,7 @@ namespace Isis {
    * <tt>spacit -> R -> ck/europa_sa_17F12v2_tour_eom_ecr3018.bc -> INSTRUMENT_ID</tt>
 
    * @note Could not use spacit's S option, we do not have a SCLK for Clipper EIS yet.
-   *   
+   *
    * @return int The appropriate instrument code for the "Camera-Matrix" Kernel Frame ID.
    */
   int ClipperNacRollingShutterCamera::CkFrameId() const {
@@ -179,7 +166,7 @@ namespace Isis {
 
 
 /**
- * This is the function that is called in order to instantiate an ClipperNacRollingShutterCamera 
+ * This is the function that is called in order to instantiate an ClipperNacRollingShutterCamera
  * object.
  *
  * @param Isis::Cube &cube Clipper EIS image.
diff --git a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.h b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.h
index 359a908d44d8b23fea6f885133bb541a97c66711..bd650d704d02ee633c8c9574f983e4694d36a06d 100644
--- a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.h
+++ b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.h
@@ -1,25 +1,13 @@
 #ifndef ClipperNacRollingShutterCamera_h
 #define ClipperNacRollingShutterCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
  #include "RollingShutterCamera.h"
 
@@ -34,8 +22,8 @@ namespace Isis {
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Clipper
    *
-   * @author 2018-04-09 Makayla Shepherd and Ian Humphrey 
-   *  
+   * @author 2018-04-09 Makayla Shepherd and Ian Humphrey
+   *
    *
    */
   class ClipperNacRollingShutterCamera : public RollingShutterCamera {
diff --git a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/unitTest.cpp b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/unitTest.cpp
index d262d8747b0bd60b77eac5b39c8ca10b6219cc16..9d91834ca44bfd2d6323c0de295e300d5dcf8dd4 100644
--- a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/unitTest.cpp
+++ b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 
 #include <iomanip>
@@ -47,9 +36,9 @@ void TestLineSamp(Camera *cam, double samp, double line);
  */
 
 // IMPORTANT NOTE: This test is believed to be failing because the test data has an arbitrary date
-// for the StartTime, which means that the spice probably shows the spacecraft as not being near and 
+// for the StartTime, which means that the spice probably shows the spacecraft as not being near and
 // pointed at Europa. If the spacecraft isn't near and pointed at Europa, there will be no intersection
-// and SetImage will fail. 
+// and SetImage will fail.
 int main(void) {
   Preference::Preferences(true);
 
diff --git a/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.cpp b/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.cpp
index ad096be4fa10c60db80ed464996c77b562cf8923..f5b41c4472a02bf8bbe5f477d28ee8136096ebcf 100644
--- a/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.cpp
+++ b/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "ClipperWacFcCamera.h"
 
@@ -40,8 +28,8 @@ namespace Isis {
    *
    * @param lab Pvl label from a Clipper wide angle framing camera image.
    *
-   * @author Stuart Sides and Summer Stapleton-Greig 
-   *  
+   * @author Stuart Sides and Summer Stapleton-Greig
+   *
    * @internal
    */
   ClipperWacFcCamera::ClipperWacFcCamera(Cube &cube) : FramingCamera(cube) {
@@ -53,14 +41,14 @@ namespace Isis {
 
     NaifStatus::CheckErrors();
 
-    SetFocalLength(); 
+    SetFocalLength();
     SetPixelPitch();
 
     // Set up detector map, focal plane map, and distortion map
     new CameraDetectorMap(this);
     new CameraFocalPlaneMap(this, naifIkCode());
     new CameraDistortionMap(this);
-    
+
     // Setup the ground and sky map
     new CameraGroundMap(this);
     new CameraSkyMap(this);
@@ -81,10 +69,10 @@ namespace Isis {
   }
 
   /**
-   * Returns the shutter open and close times.  The LORRI camera doesn't use a shutter to start and 
+   * Returns the shutter open and close times.  The LORRI camera doesn't use a shutter to start and
    * end an observation, but this function is being used to get the observation start and end times,
-   * so we will simulate a shutter. 
-   * 
+   * so we will simulate a shutter.
+   *
    * @param exposureDuration ExposureDuration keyword value from the labels,
    *                         converted to seconds.
    * @param time The StartTime keyword value from the labels, converted to
diff --git a/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.h b/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.h
index b413825452eb5430108dd96776e1f264831530fb..7c8d39b4e29e9ee958be811a06d0615c7ebd596f 100644
--- a/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.h
+++ b/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.h
@@ -1,24 +1,13 @@
 #ifndef ClipperWacFcCamera_h
 #define ClipperWacFcCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -26,7 +15,7 @@
 
 namespace Isis {
   /**
-   * This is the camera model for the Europa Clipper WAC Framing Camera 
+   * This is the camera model for the Europa Clipper WAC Framing Camera
    *
    */
   class ClipperWacFcCamera : public FramingCamera {
@@ -37,12 +26,12 @@ namespace Isis {
       //! Destroys the ClipperWacFcCamera object
       ~ClipperWacFcCamera() {};
 
-    /** 
-     * Reimplemented from FrameCamera 
-     *  
+    /**
+     * Reimplemented from FrameCamera
+     *
      * @param time Start time of the observation
      * @param exposureDuration The exposure duration of the observation
-     * 
+     *
      * @return std::pair<iTime,iTime> The start and end times of the observation
      */
       virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
@@ -51,25 +40,25 @@ namespace Isis {
 
       /**
        * CK frame ID - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-159011); }
 
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/clipper/objs/ClipperWacFcCamera/unitTest.cpp b/isis/src/clipper/objs/ClipperWacFcCamera/unitTest.cpp
index ecb542835d8ef004a406f0c62ca385ecf55ee6b0..846f760647238ece7faf672210383092da918d12 100644
--- a/isis/src/clipper/objs/ClipperWacFcCamera/unitTest.cpp
+++ b/isis/src/clipper/objs/ClipperWacFcCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 
 #include <iomanip>
diff --git a/isis/src/control/apps/autoseed/autoseed.cpp b/isis/src/control/apps/autoseed/autoseed.cpp
index 567e9aa9cfbfb7b80e4238e96549e5cea478ced6..c49717efd0e2d6465489270944bbd60483ff00f9 100644
--- a/isis/src/control/apps/autoseed/autoseed.cpp
+++ b/isis/src/control/apps/autoseed/autoseed.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "autoseed.h"
 
 #include <map>
diff --git a/isis/src/control/apps/autoseed/autoseed.h b/isis/src/control/apps/autoseed/autoseed.h
index 76cd71066f4f7f1f29a2773c202632219e88d0f9..ccc0d7a92a3d494255ea592ee029221440b8e4e3 100644
--- a/isis/src/control/apps/autoseed/autoseed.h
+++ b/isis/src/control/apps/autoseed/autoseed.h
@@ -1,6 +1,14 @@
 #ifndef autoseed_h
 #define autoseed_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNet.h"
 #include "Pvl.h"
 #include "UserInterface.h"
diff --git a/isis/src/control/apps/autoseed/main.cpp b/isis/src/control/apps/autoseed/main.cpp
index aad402f29da62254e4d8a76e100a9f696c01f516..6b81a86896c628cf9de6fdd82b632b8b412e150c 100644
--- a/isis/src/control/apps/autoseed/main.cpp
+++ b/isis/src/control/apps/autoseed/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "autoseed.h"
diff --git a/isis/src/control/apps/cnet2dem/ControlPointCloudPt.h b/isis/src/control/apps/cnet2dem/ControlPointCloudPt.h
index 13c9eb671b3fbb2e449b3bbcd7e064f429eb9556..2be51105b3b61d7626ab4db89df63dd6bb39b7cb 100644
--- a/isis/src/control/apps/cnet2dem/ControlPointCloudPt.h
+++ b/isis/src/control/apps/cnet2dem/ControlPointCloudPt.h
@@ -1,26 +1,13 @@
 #ifndef ControlPointCloudPt_h
 #define ControlPointCloudPt_h
-/**
- * @file
- * $Revision: 1.0 $ 
- * $Date: 2014/02/27 18:49:25 $ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <cmath>
 
@@ -38,14 +25,14 @@ namespace Isis {
 
 /**
  * @brief 3-D ControlPoint class for use in PointCloud datasets
- *  
+ *
  *  The ControlPoint container is required to not change its content for the
  *  duration of use of the nanoflann kd-tree built from the points.
- *  
+ *
  * @author 2015-10-11 Kris Becker
- *  
- * @internal 
- *   @history 2015-10-11 Kris Becker - Original Version 
+ *
+ * @internal
+ *   @history 2015-10-11 Kris Becker - Original Version
  */
 
 class ControlPointCloudPt {
@@ -62,25 +49,25 @@ class ControlPointCloudPt {
     ControlPointCloudPt() : m_xyz(), m_type(Image), m_serialno(),
                             m_data( new ControlPointData() ),
                             m_merged() {
-      m_data->getImageCoordinates(m_xyz); 
+      m_data->getImageCoordinates(m_xyz);
     }
 
     ControlPointCloudPt(ControlPoint *point, const CoordinateType &ptype,
                         const Ownership owner,
-                        const QString &serialno = "", 
-                        const double &weight = 1.0) : 
+                        const QString &serialno = "",
+                        const double &weight = 1.0) :
                         m_xyz( ), m_type(ptype), m_serialno(serialno),
                         m_data(new ControlPointData(point, owner, weight)),
                         m_merged() {
       if ( Image == ptype ) {
         m_data->setReference(serialno);
-        if ( !selectImageCoordinates() ) { 
-          m_data->disable(); 
+        if ( !selectImageCoordinates() ) {
+          m_data->disable();
         }
       }
       else {  //  ( Ground == ptype )
-        if ( !selectGroundCoordinates() ) { 
-          m_data->disable(); 
+        if ( !selectGroundCoordinates() ) {
+          m_data->disable();
         }
       }
     }
@@ -158,9 +145,9 @@ class ControlPointCloudPt {
     inline double w() const { return ( m_xyz[3] ); }
     inline const double *array() const { return ( m_xyz ); }
 
-    /** Compute real vector length (radius) from ControlPoint 
-     *  
-     *  Radius is returned in meters  
+    /** Compute real vector length (radius) from ControlPoint
+     *
+     *  Radius is returned in meters
      */
     inline double radius() const {
       // compute magnitude
@@ -171,7 +158,7 @@ class ControlPointCloudPt {
 
 
     /** Compute vector length (radius) - code based upon NAIF
-     *  
+     *
      *  Radius is returned in units of input parameters
      */
     inline double radius(const double x, const double y, const double z) const {
@@ -198,27 +185,27 @@ class ControlPointCloudPt {
     }
 
   private:
-    /** 
-     * @brief Shared ControlPoint data pointer 
-     * 
+    /**
+     * @brief Shared ControlPoint data pointer
+     *
      * @author 2015-10-11 Kris Becker
-     *  
-     * @internal 
+     *
+     * @internal
      *   @history 2015-10-11 Kris Becker - Original Version
      */
     class ControlPointData : public QSharedData {
       typedef ControlPointCloudPt::Ownership Ownership;
       public:
-        ControlPointData() : QSharedData(), m_point(0), m_reference(0), 
+        ControlPointData() : QSharedData(), m_point(0), m_reference(0),
                              m_weight(1.0), m_initial(0),
                              m_owner(Exclusive){ }
-        ControlPointData(ControlPoint *point, const Ownership owner, 
+        ControlPointData(ControlPoint *point, const Ownership owner,
                          const double weight = 1.0) :
-                         QSharedData(), m_point(point), 
-                         m_reference(0), 
+                         QSharedData(), m_point(point),
+                         m_reference(0),
                          m_weight(weight),
-                         m_initial(point->GetNumValidMeasures()), 
-                         m_owner(owner) { 
+                         m_initial(point->GetNumValidMeasures()),
+                         m_owner(owner) {
           if ( m_point->GetNumMeasures() > 0) {
             m_reference = m_point->GetRefMeasure();
           }
@@ -229,7 +216,7 @@ class ControlPointCloudPt {
                          m_weight(other.m_weight),
                          m_initial(other.m_initial),
                          m_owner(Shared) { }
-        ~ControlPointData() { 
+        ~ControlPointData() {
           if ( Exclusive == m_owner ) {
              delete (m_point);
              m_point = 0;
@@ -294,12 +281,12 @@ class ControlPointCloudPt {
         inline bool isDisabled() const {
           if ( 0 == m_point ) return ( true );
           return (
-                   m_point->IsInvalid()  || 
-                   m_point->IsIgnored() || 
+                   m_point->IsInvalid()  ||
+                   m_point->IsIgnored() ||
                    m_point->IsRejected() ||
                    m_point->IsEditLocked()  ||
                    ( 0 == m_reference )
-                   ); 
+                   );
         }
 
         inline void disable() {
@@ -309,10 +296,10 @@ class ControlPointCloudPt {
           return;
         }
 
-        // The first to call this method will take ownership of the 
+        // The first to call this method will take ownership of the
         // ControlPoint if Exclusive. Cloned otherwise.
         ControlPoint *take() {
-          ControlPoint *p(m_point); 
+          ControlPoint *p(m_point);
           if ( 0 == m_point ) {  return (p); }
 
           // If someone else owns the point, clone it
@@ -329,7 +316,7 @@ class ControlPointCloudPt {
         }
 
         // Data....
-        ControlPoint          *m_point; 
+        ControlPoint          *m_point;
         ControlMeasure        *m_reference;
         double                m_weight;
         int                   m_initial;
@@ -338,7 +325,7 @@ class ControlPointCloudPt {
 
       private:
         inline bool getNoPointData(double coords[4]) const {
-          coords[0] = coords[1] = coords[2] = 0.0; 
+          coords[0] = coords[1] = coords[2] = 0.0;
           coords[3] = m_weight;
           return ( false );
         }
diff --git a/isis/src/control/apps/cnet2dem/DatumFunctoid.cpp b/isis/src/control/apps/cnet2dem/DatumFunctoid.cpp
index 1615ecc7f4572fabf5d0f5affeec65923d40fca4..67be26564a0e095677af749d96ae86acf63070ae 100644
--- a/isis/src/control/apps/cnet2dem/DatumFunctoid.cpp
+++ b/isis/src/control/apps/cnet2dem/DatumFunctoid.cpp
@@ -1,26 +1,11 @@
-/**                                                                       
- * @file                                                                  
- * $Revision$
- * $Date$
- * $Id$
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */ 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cstdarg>
 #include <cstdio>
 #include <string>
@@ -57,9 +42,9 @@ DatumFunctoidFactory::DatumFunctoidFactory() {
    return;
 }
 
-DatumFunctoidFactory::~DatumFunctoidFactory() { } 
+DatumFunctoidFactory::~DatumFunctoidFactory() { }
 
-DatumFunctoidFactory *DatumFunctoidFactory::getInstance() { 
+DatumFunctoidFactory *DatumFunctoidFactory::getInstance() {
   if (!m_maker) {
     m_maker = new DatumFunctoidFactory();
   }
@@ -78,16 +63,16 @@ QStringList DatumFunctoidFactory::algorithms() const {
 }
 
 DatumFunctoidList DatumFunctoidFactory::create(const QString &specs,
-                                               const bool &errorIfEmpty) 
+                                               const bool &errorIfEmpty)
                                                const {
-  DatumFunctoidList functoids; 
+  DatumFunctoidList functoids;
 
   // Individual algorithm specifications are separated by vertical bars
   QStringList algorithms = specs.split(",", QString::SkipEmptyParts);
   // cout << "create: got " << algorithms.size() << " algorithms...\n";
   if ( algorithms.size() == 0 ) {
     if ( errorIfEmpty ) {
-      QString mess = "No functoid algorithm specifictions found!"; 
+      QString mess = "No functoid algorithm specifictions found!";
       throw IException(IException::User, mess, _FILEINFO_);
     }
     return ( functoids );
@@ -103,7 +88,7 @@ DatumFunctoidList DatumFunctoidFactory::create(const QString &specs,
       nerrors++;
     }
     else {
-      functoids.append(f); 
+      functoids.append(f);
     }
   }
 
@@ -130,14 +115,14 @@ DatumFunctoid *DatumFunctoidFactory::make(const QString &funcspec) const {
 
 /**
  * @brief Parse a parameter string for values and return in parameter map
- * 
+ *
  * @author 2015-09-08 Kris Becker
- * 
- * @param parameters 
- * 
- * @return PvlFlatMap 
+ *
+ * @param parameters
+ *
+ * @return PvlFlatMap
  */
-PvlFlatMap DatumFunctoidFactory::parseParameters(const QString &parameters) 
+PvlFlatMap DatumFunctoidFactory::parseParameters(const QString &parameters)
                                                     const {
   PvlFlatMap pmap;
 
@@ -173,7 +158,7 @@ PvlFlatMap DatumFunctoidFactory::parseParameters(const QString &parameters)
  /**
    * @brief Exit termination routine
    *
-   * This (static) method ensure this object is destroyed when Qt exits.  
+   * This (static) method ensure this object is destroyed when Qt exits.
    *
    * Note that it is error to add this to the system _atexit() routine because
    * this object utilizes Qt classes.  At the time the atexit call stack is
diff --git a/isis/src/control/apps/cnet2dem/DatumFunctoid.h b/isis/src/control/apps/cnet2dem/DatumFunctoid.h
index 41b558384de71c657ed0f99a591058f620252d01..0c9dedac287df0502bb3f952af0dbf29f72f8974 100644
--- a/isis/src/control/apps/cnet2dem/DatumFunctoid.h
+++ b/isis/src/control/apps/cnet2dem/DatumFunctoid.h
@@ -1,26 +1,13 @@
 #ifndef DatumFunctoid_h
 #define DatumFunctoid_h
-/**
- * @file
- * $Revision: 1.0 $
- * $Date: 2014/02/27 18:49:25 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <cmath>
 #include <QList>
diff --git a/isis/src/control/apps/cnet2dem/MapPointCollector.h b/isis/src/control/apps/cnet2dem/MapPointCollector.h
index ea1844526870b3d892f580a2949f1b27aa322113..0913c5cdf8a25944eb458f7ee1b80250cdcdbf19 100644
--- a/isis/src/control/apps/cnet2dem/MapPointCollector.h
+++ b/isis/src/control/apps/cnet2dem/MapPointCollector.h
@@ -1,26 +1,13 @@
 #ifndef MapPointCollector_h
 #define MapPointCollector_h
-/**
- * @file
- * $Revision: 1.0 $ 
- * $Date: 2014/02/27 18:49:25 $ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QList>
 #include <QPair>
@@ -36,90 +23,90 @@ namespace Isis {
 
   /**
    * @brief Gather ControlPoints for generation of an output map (radius) pixel
-   *  
-   * This class will collect ControlPoint candidates that are within 
+   *
+   * This class will collect ControlPoint candidates that are within
    * a tolerance generation of an output radius map pixel
-   *  
-   * @author 2015-11-16 Kris Becker 
-   *  
-   * @internal 
+   *
+   * @author 2015-11-16 Kris Becker
+   *
+   * @internal
    *   @history 2015-11-16 Kris Becker - Original Version
    */
-  
+
   class MapPointCollector {
     public:
       enum SearchType { UnDefined, Radius, NearestNeighbor };
       MapPointCollector() : m_source(), m_candidates(),
                             m_radius_stats(), m_distance_stats() { }
       virtual ~MapPointCollector() { }
-  
+
       int size() const {
         return ( m_candidates.size() );
       }
-  
+
       const Statistics &getRadiusStatistics() const {
         return ( m_radius_stats );
       }
-  
+
       const Statistics &getDistanceStatistics() const {
         return ( m_distance_stats );
       }
-  
+
       const ControlPointCloudPt &getSource() const {
         return ( m_source );
       }
-  
+
       const ControlPointCloudPt &getPoint(const int index) const {
         Q_ASSERT (index >= 0);
         Q_ASSERT ( index < m_candidates.size() );
         return ( m_candidates[index].first );
       }
-  
+
       double getDistance(const int index) const {
         Q_ASSERT (index >= 0);
         Q_ASSERT ( index < m_candidates.size() );
         return ( m_candidates[index].second );
       }
-  
+
       SearchType getSearchType() const {
         return ( m_search_type );
       }
-  
+
       void setSearchType (const SearchType stype) {
         m_search_type = stype;
       }
-  
+
       void apply(ControlPointCloudPt &source, ControlPointCloudPt &candidate,
                  const double distance)  {
   #if 0
         if ( !source.isValid() ) { return; }
         if ( !candidate.isValid() ) { return; }
   #endif
-  
+
         m_source = source;
         m_candidates.push_back( qMakePair(candidate, distance));
         m_radius_stats.AddData(candidate.radius());
         m_distance_stats.AddData(distance);
         return;
       }
-  
+
     /**
      * @brief Noise remove using standard deviations with radius
-     * 
+     *
      * @author 2015-12-10 Kris Becker
-     * 
-     * @param sigma Number of standard deviations from the median to filter as 
+     *
+     * @param sigma Number of standard deviations from the median to filter as
      *              noise
-     * 
+     *
      * @return int number removed
      */
       int removeNoise(const double sigma = 3.0) {
          if ( size() < 3 ) return (0);  // Can't really do with less
-  
+
          double v_median = computeMedian(m_candidates);
          double v_stddev = m_radius_stats.StandardDeviation();
          double v_tolerance = v_stddev * sigma;
-  
+
          PointDistPair v_outpairs;
          Statistics    v_radiusStats, v_distanceStats;
          for (int i = 0; i < m_candidates.size(); i++) {
@@ -131,7 +118,7 @@ namespace Isis {
              v_distanceStats.AddData(m_candidates[i].second);
            }
          }
-  
+
          // Recompute statistics
          int v_removed = m_candidates.size() - v_outpairs.size();
          m_candidates = v_outpairs;
@@ -139,7 +126,7 @@ namespace Isis {
          m_distance_stats = v_distanceStats;
         return ( v_removed );
       }
-  
+
     private:
       typedef QList< QPair<ControlPointCloudPt, double> >  PointDistPair;
       ControlPointCloudPt  m_source;
@@ -147,17 +134,17 @@ namespace Isis {
       Statistics           m_radius_stats;
       Statistics           m_distance_stats;
       SearchType           m_search_type;
-  
+
       double computeMedian(const PointDistPair &points) const {
         double median = Null;
         if ( points.size() == 0 )  return ( median );
         if ( points.size() == 1 )  return ( points[0].first.radius() );
-  
+
         QVector<double> v_radii;
         for (int i = 0; i < points.size(); i++) {
           v_radii.push_back(points[i].first.radius() );
         }
-  
+
         qSort(v_radii);
         if ( (v_radii.size() % 2) == 0 ) {
           int ndx0 = (v_radii.size() - 1) / 2;
@@ -166,7 +153,7 @@ namespace Isis {
         else {
           median = v_radii[v_radii.size()/2];
         }
-        return ( median ); 
+        return ( median );
       }
   };
 
diff --git a/isis/src/control/apps/cnet2dem/PointCloud.h b/isis/src/control/apps/cnet2dem/PointCloud.h
index 08f94318b4c5be3a0943396b679372fb7d07cc6f..ac43aad074fe6b1bd51c48c0264638e4b0aad42e 100644
--- a/isis/src/control/apps/cnet2dem/PointCloud.h
+++ b/isis/src/control/apps/cnet2dem/PointCloud.h
@@ -1,38 +1,25 @@
 #ifndef PointCloud_h
 #define PointCloud_h
-/**
- * @file
- * $Revision: 1.0 $ 
- * $Date: 2014/02/27 18:49:25 $ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QtGlobal>
 #include <QVector>
 
 namespace Isis {
 
-  /** 
+  /**
    * Functor to compute 3-d Euclidean distances
    *
    * @author 2014-02-17 Kris Becker
-   *  
-   * @internal 
+   *
+   * @internal
    *   @history 2014-02-17 Kris Becker - Original version.
    */
   template <class T> class Dist3d {
@@ -40,18 +27,18 @@ namespace Isis {
       enum { Dimension = 3 };
       Dist3d() { }
       ~Dist3d() { }
-    
+
       inline int dimension() const {
         return ( Dimension );
       }
-    
+
       inline double operator()(const T &datum1, const T &datum2) const {
         double dx = datum1.x() - datum2.x();
         double dy = datum1.y() - datum2.y();
         double dz = datum1.z() - datum2.z();
         return ( dx*dx + dy*dy + dz*dz );
       }
-    
+
       inline double operator()(const double *datum1, const T &datum2) const {
         double dx = datum1[0] - datum2.x();
         double dy = datum1[1] - datum2.y();
@@ -59,14 +46,14 @@ namespace Isis {
         return ( dx*dx + dy*dy + dz*dz );
       }
   };
-  
 
-  /** 
+
+  /**
    * Functor to compute 2-d Euclidean distances
    *
    * @author 2014-02-17 Kris Becker
-   *  
-   * @internal 
+   *
+   * @internal
    *   @history 2014-02-17 Kris Becker - Original version.
    */
   template <class T> class Dist2d {
@@ -74,31 +61,31 @@ namespace Isis {
       enum { Dimension = 2 };
       Dist2d() { }
       ~Dist2d() { }
-    
+
       inline int dimension() const {
         return ( Dimension );
       }
-    
+
       inline double operator()(const T &datum1, const T &datum2) const {
         double dx = datum1.x() - datum2.x();
         double dy = datum1.y() - datum2.y();
         return ( dx*dx + dy*dy );
       }
-    
+
       inline double operator()(const double *datum1, const T &datum2) const {
         double dx = datum1[0] - datum2.x();
         double dy = datum1[1] - datum2.y();
         return ( dx*dx + dy*dy );
       }
   };
-  
 
-  /** 
-   * Functor to compute 1-d Manhattan distances 
-   *  
+
+  /**
+   * Functor to compute 1-d Manhattan distances
+   *
    * @author 2014-02-17 Kris Becker
-   *  
-   * @internal 
+   *
+   * @internal
    *   @history 2014-02-17 Kris Becker - Original version.
    */
   template <class T> class Dist1d {
@@ -106,71 +93,71 @@ namespace Isis {
       enum { Dimension = 1 };
       Dist1d() { }
       ~Dist1d() { }
-    
+
       inline int dimension() const {
         return ( Dimension );
       }
-    
-    
+
+
       inline double operator()(const T &datum1, const T &datum2) const {
         double dx = datum1.x() - datum2.x();
         return ( dx*dx );
       }
-    
+
       inline double operator()(const double *datum1, const T &datum2) const {
         double dx = datum1[0] - datum2.x();
         return ( dx*dx );
       }
   };
-  
-  
+
+
   /**
-   * @brief Point cloud adapter class for nanoflann kd-tree interface 
-   *  
-   * This class provides the point cloud class for Point3d clouds that interface 
-   * with the nanoflann (http://code.google.com/p/nanoflann/) kd-tree fast search 
-   * query library. The reference for this approach can be found in an example 
-   * found at 
+   * @brief Point cloud adapter class for nanoflann kd-tree interface
+   *
+   * This class provides the point cloud class for Point3d clouds that interface
+   * with the nanoflann (http://code.google.com/p/nanoflann/) kd-tree fast search
+   * query library. The reference for this approach can be found in an example
+   * found at
    * http://nanoflann.googlecode.com/svn/trunk/examples/pointcloud_kdd_radius.cpp.
-   *  
-   * This class is designed to accept a reference to a container of 3-d points. 
-   * In addition, this class accesses individual points from PointCloud using a 
-   * vector component operator so as to standardize and complete this interface: 
-   *  
+   *
+   * This class is designed to accept a reference to a container of 3-d points.
+   * In addition, this class accesses individual points from PointCloud using a
+   * vector component operator so as to standardize and complete this interface:
+   *
    * @code
    *   double x() const;  // X component of point
    *   double y() const;  // Y component of point
    *   double z() const;  // Z component of point
    *   double w() const;  // Optional weight of point (default should be 1.0)
    * @endcode
-   *  
+   *
    * The point container is required to not change its content for the duration
    * of use of the nanoflann kd-tree built from the points. Because of this,
    * there is no clear() method to discard existing points.
-   * 
+   *
    * This class supports 2D and 3D Euclidean distant calculations. This option is
    * specified in the PointCloudTree class constructor when building the kd-tree
    * index.
-   * 
+   *
    * The routines kdtree_get_point_count(), kdtree_distance(), kdtree_get_pt()
    * and kdtree_get_bbox() (default implementation) satisfy the needs of the
    * Nanoflann kd-tree template library.
-   * 
+   *
    * This class is not a template, but all its methods are inlined for efficiency
    * reasons. This implemetation approach allows us to take best advantage of the
    * optimization that the Nanoflann library offers.
-   * 
+   *
    * The Point3d class is also optimized in the same fashion and offers a
    * flexible point base class to complete the implementation.
-   * 
+   *
    * This point cloud class is designed with the body-fixed coordinate system in
    * mind. Therfore, the units of the point vectors is assumed to be kilometers
    * but this is not required - as long as Euclidean distances apply to the point
    * dataset, any 3D vector representation could utilize this class.
-   *  
+   *
    * @author 2014-02-17 Kris Becker
-   *  
-   * @internal 
+   *
+   * @internal
    *   @history 2014-02-17 Kris Becker - Original version.
    */
   template <class T, class Distance = Dist3d<T> > class PointCloud {
@@ -178,56 +165,56 @@ namespace Isis {
       PointCloud() : m_distance(), m_points()  { }
       PointCloud(const Distance &functor) : m_distance(functor), m_points()  { }
       PointCloud(const int &npoints, const Distance &functor = Distance()) :
-                 m_distance(functor), m_points() { 
-        m_points.reserve(npoints); 
+                 m_distance(functor), m_points() {
+        m_points.reserve(npoints);
       }
-  
+
       PointCloud(const QVector<T> &points) : m_points(points) { }
       virtual ~PointCloud() { }
-  
-  
+
+
       /** Standard size method */
       inline int size() const {
         return ( m_points.size() );
       }
-  
+
       Distance &getDistance() {
         return ( m_distance );
       }
-  
+
       /** Add a new point to the list */
       inline void addPoint(const T &point) {
         m_points.push_back(point);
       }
-  
+
       /** Return a reference to the point at index idx */
       inline const T &point(const size_t idx) const {
         Q_ASSERT( idx >= 0 );
         Q_ASSERT( idx < (size_t) size() );
         return (m_points[idx]);
       }
-  
+
       inline double distance( const T &first, const T &second ) const {
         return ( m_distance(first, second) );
       }
-  
+
       /** Return number of points in cloud */
       inline size_t kdtree_get_point_count() const {
         return ( m_points.size() );
       }
-  
+
     /**
      * @brief Return Euclidean distance from a source point to the indexed point
-     *  
+     *
      * This method returns the Euclidean (L2) distance from a dataset point and a
-     * source point (p1).  We only use X and Y components to compute this 
-     * distance since our objective is to identify points in 2-d space. 
-     * 
+     * source point (p1).  We only use X and Y components to compute this
+     * distance since our objective is to identify points in 2-d space.
+     *
      * @author 2014-02-27 Kris Becker
-     * 
+     *
      * @param p1      3-vector of the source point
      * @param idx_p2  Index into point data set contained herein
-     * 
+     *
      * @return double Returns the squared distance - not the square root!
      */
       inline double kdtree_distance(const double *p1, const size_t idx_p2,
@@ -236,18 +223,18 @@ namespace Isis {
         Q_ASSERT( idx_p2 < (size_t) size() );
         return ( m_distance(p1, point(idx_p2)) );
       }
-  
+
     /**
-     * @brief Returns a value for a single dimemsion of a vector 
-     *  
-     * This method provides a simple interface to each vector element in the point 
+     * @brief Returns a value for a single dimemsion of a vector
+     *
+     * This method provides a simple interface to each vector element in the point
      * cloud.
-     * 
+     *
      * @history 2014-03-03 Kris Becker
-     * 
+     *
      * @param idx Index of the point to get element from
-     * @param dim The index (0 - 2)of the ith element of the vector 
-     * 
+     * @param dim The index (0 - 2)of the ith element of the vector
+     *
      * @return double Value at the specfied vector point index
      */
       inline double kdtree_get_pt(const size_t idx, int dim) const {
@@ -255,16 +242,16 @@ namespace Isis {
         if ( dim == 1 )  return ( point(idx).y() );
         return ( point(idx).z() );
       }
-  
+
       /** Let nanoflann range algorithm compute the bounding box */
-      template <class BBOX> bool kdtree_get_bbox(BBOX &bb) const { 
-        return (false); 
+      template <class BBOX> bool kdtree_get_bbox(BBOX &bb) const {
+        return (false);
       }
-  
+
     private:
       Distance   m_distance; ///!< Instantiation of distance functor
       QVector<T> m_points;   ///!< points in the point cloud
-  
+
   };
 
 };  // namespace Isis
diff --git a/isis/src/control/apps/cnet2dem/PointCloudSearchResult.h b/isis/src/control/apps/cnet2dem/PointCloudSearchResult.h
index 309ffd15af4f8943676393feed94492eafab93ae..b6837fadf384598f357971789d6d2da7ebd5b9e6 100644
--- a/isis/src/control/apps/cnet2dem/PointCloudSearchResult.h
+++ b/isis/src/control/apps/cnet2dem/PointCloudSearchResult.h
@@ -1,26 +1,13 @@
 #ifndef PointCloudSearchResult_h
 #define PointCloudSearchResult_h
-/**
- * @file
- * $Revision: 1.0 $ 
- * $Date: 2014/02/27 18:49:25 $ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QPair>
 #include <QSharedPointer>
@@ -29,39 +16,39 @@
 namespace Isis {
 
   template <typename T, typename D> class PointCloud;
-  
+
   /**
-   * @brief Point cloud query result container 
-   *  
-   * This class provides a convenient and efficent implementation to contain the 
-   * results of a PointCloudTree search result. 
-   *  
+   * @brief Point cloud query result container
+   *
+   * This class provides a convenient and efficent implementation to contain the
+   * results of a PointCloudTree search result.
+   *
    * Contained in this object is all the ControlPoints resulting from a radial or
    * neighbor proximity search.
-   *  
-   * It is up to the calling enviroment to use the results whilst preserving the 
-   * content of the PointCloud elements as they are provided via a reference into 
-   * the original point cloud. 
-   *  
-   * Care is taken to filter out the source, as it will likely be included in 
-   * every search query, and any invalid points since the status of the points 
-   * could change during processing. 
-   *  
+   *
+   * It is up to the calling enviroment to use the results whilst preserving the
+   * content of the PointCloud elements as they are provided via a reference into
+   * the original point cloud.
+   *
+   * Care is taken to filter out the source, as it will likely be included in
+   * every search query, and any invalid points since the status of the points
+   * could change during processing.
+   *
    * For any type T, here are only two required methods - and operator!=() and an
-   * isValid() method. Well I suppose the only other required is a default 
-   * constructor as well. 
-   *  
-   * @author 2015-10-11 Kris Becker 
-   *  
-   * @internal 
+   * isValid() method. Well I suppose the only other required is a default
+   * constructor as well.
+   *
+   * @author 2015-10-11 Kris Becker
+   *
+   * @internal
    *   @history 2015-10-11 Kris Becker - Original Version
    */
-  
+
   template <class T, class D>
   class PointCloudSearchResult {
     public:
       enum SearchType { UnDefined, Radius, NearestNeighbor };
-      PointCloudSearchResult() { 
+      PointCloudSearchResult() {
         m_search_type = UnDefined;
         m_source        = T();
         m_neighbors     = 0;
@@ -69,13 +56,13 @@ namespace Isis {
         m_matches.clear();
         m_pc            = QSharedPointer<PointCloud<T,D> > (0);
       }
-  
-      PointCloudSearchResult(const T &source, int neighbors, 
-                      QVector<size_t> &indices, QVector<double> &distances, 
-                      QSharedPointer<PointCloud<T,D> > &pc) { 
+
+      PointCloudSearchResult(const T &source, int neighbors,
+                      QVector<size_t> &indices, QVector<double> &distances,
+                      QSharedPointer<PointCloud<T,D> > &pc) {
         Q_ASSERT ( indices.size() == distances.size() );
         Q_ASSERT ( neighbors == indices.size() );
-  
+
         m_search_type   = NearestNeighbor;
         m_source        = source;
         m_neighbors     = neighbors;
@@ -86,15 +73,15 @@ namespace Isis {
           const T &p = m_pc->point(indices[i]);
           if ( m_source != p) {
             if ( p.isValid() ) {
-              m_matches.push_back(qMakePair<T, double>(p, std::sqrt(distances[i]))); 
+              m_matches.push_back(qMakePair<T, double>(p, std::sqrt(distances[i])));
             }
           }
         }
       }
-  
-      PointCloudSearchResult(const T &source, const double radius_sq, 
+
+      PointCloudSearchResult(const T &source, const double radius_sq,
                       std::vector< std::pair<size_t, double> > &matches,
-                      const QSharedPointer<PointCloud<T,D> > &pc, 
+                      const QSharedPointer<PointCloud<T,D> > &pc,
                       const int nfound = 0) {
         m_search_type = Radius;
         m_source = source;
@@ -106,68 +93,68 @@ namespace Isis {
           const T &p = m_pc->point(matches[i].first);
           if ( m_source != p) {
             if ( p.isValid() ) {
-              m_matches.push_back(qMakePair<T, double>(p, std::sqrt(matches[i].second))); 
+              m_matches.push_back(qMakePair<T, double>(p, std::sqrt(matches[i].second)));
             }
           }
         }
       }
-  
+
       virtual ~PointCloudSearchResult() { }
-  
+
       inline bool isValid() const {
         return ( !(UnDefined == m_search_type) );
       }
-  
+
       inline SearchType type() const {
         return ( m_search_type );
       }
-  
+
       /** Return number of points from the cloud search   */
       inline int size() const {
         return ( m_matches.size() );
       }
-  
+
       inline double search_radius() const {
         return ( m_search_radius );
       }
-  
+
       inline double neighbors() const {
         return ( m_neighbors );
       }
-  
+
       inline const T &source() const {
         return ( m_source );
       }
-  
+
       inline const T &point(const size_t idx) const {
         // Fetch the point from the PointCloud
         return ( m_pc->point(m_matches[idx].first) );
       }
-  
+
       /** Return search distance in search units */
       inline double distance(const size_t idx) const {
         return ( m_matches[idx].second );
       }
-  
+
       template <class P> int forEachPair( P &process ) {
           int npairs( 0 );
           for ( int m = 0; m <  m_matches.size(); m++) {
-             process.apply(m_source, m_matches[m].first, m_matches[m].second); 
+             process.apply(m_source, m_matches[m].first, m_matches[m].second);
              npairs++;
           }
           return ( npairs );
         }
-  
-  
+
+
     private:
       SearchType           m_search_type;
       T                    m_source;
       int                  m_neighbors;
       double               m_search_radius;
-  
+
       QVector< QPair<T, double> >      m_matches;
       QSharedPointer<PointCloud<T,D> > m_pc;
-  
+
   };
 
 };  // namespace Isis
diff --git a/isis/src/control/apps/cnet2dem/PointCloudTree.h b/isis/src/control/apps/cnet2dem/PointCloudTree.h
index df2b3912e62d342ed7eb41714c75cfb612c731ce..680188ddb2052e77375d69d952def1fe656147e5 100644
--- a/isis/src/control/apps/cnet2dem/PointCloudTree.h
+++ b/isis/src/control/apps/cnet2dem/PointCloudTree.h
@@ -1,26 +1,13 @@
 #ifndef PointCloudTree_h
 #define PointCloudTree_h
-/**
- * @file
- * $Revision: 1.0 $ 
- * $Date: 2014/02/27 18:49:25 $ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <cstdlib>
 #include <vector>
@@ -36,109 +23,109 @@
 namespace Isis {
 
   /**
-   * @brief Point cloud kd-tree class using the nanoflann kd-tree library 
-   *  
-   * This class renders a point cloud in a kd-tree for very fast/efficient point 
-   * queries. This particular implementation uses Nanoflann 
-   * (http://code.google.com/p/nanoflann/) kd-tree fast search query library. 
-   *  
-   * This class is specifically designed to support body-fixed 3D point vectors. 
-   * Its units are assumed to be kilometers, but is not a requirement. 
-   *  
-   * PointCloudTree utilizes the PointCloud and Point3d classes to provide fast, 
-   * efficient and flexible 3D vector proximity searches.  The implemenations of 
-   * these classes are optimized using inline methods to take advantage of the 
-   * template optimization of the Nanoflann library. 
-   *  
-   * Developers can decide at the time of the object instantiation to use 2D or 3D 
-   * Euclidean distances in its query with the nDim parameter in the constructor. 
-   * This flexibility sacrifices a little compiler optimization using template 
-   * parameters (see the -1 KcKdTree_t). The PointCloud classes support both 2D 
+   * @brief Point cloud kd-tree class using the nanoflann kd-tree library
+   *
+   * This class renders a point cloud in a kd-tree for very fast/efficient point
+   * queries. This particular implementation uses Nanoflann
+   * (http://code.google.com/p/nanoflann/) kd-tree fast search query library.
+   *
+   * This class is specifically designed to support body-fixed 3D point vectors.
+   * Its units are assumed to be kilometers, but is not a requirement.
+   *
+   * PointCloudTree utilizes the PointCloud and Point3d classes to provide fast,
+   * efficient and flexible 3D vector proximity searches.  The implemenations of
+   * these classes are optimized using inline methods to take advantage of the
+   * template optimization of the Nanoflann library.
+   *
+   * Developers can decide at the time of the object instantiation to use 2D or 3D
+   * Euclidean distances in its query with the nDim parameter in the constructor.
+   * This flexibility sacrifices a little compiler optimization using template
+   * parameters (see the -1 KcKdTree_t). The PointCloud classes support both 2D
    * and 3D lookups. 2D are common for mapping - 3D for apply restrictions in that
-   * dimension for radius queries, particularly. 
-   *  
-   * It is important to note that the class will take ownership of the PointCloud 
-   * pointer required in the constructor.  This futher ensures that the PointCloud 
-   * will not be tampered with while the tree index is built from it. 
-   *  
-   * Query/search results are returned in a PCSearchResult object that can be used 
-   * to process the subset of points that satisfy the search parameters.  Along 
+   * dimension for radius queries, particularly.
+   *
+   * It is important to note that the class will take ownership of the PointCloud
+   * pointer required in the constructor.  This futher ensures that the PointCloud
+   * will not be tampered with while the tree index is built from it.
+   *
+   * Query/search results are returned in a PCSearchResult object that can be used
+   * to process the subset of points that satisfy the search parameters.  Along
    * with the results is a shared pointer to the PointCloud.  This provides access
    * to the Point3d points and their data variant for additional processing.
-   *  
+   *
    *  These classes are also designed to be thread-safe - maybe.
-   *  
-   * @author 2014-02-17 Kris Becker 
-   *  
-   * @internal 
-   *   @history 2014-02-17 Kris Becker - Original Version 
+   *
+   * @author 2014-02-17 Kris Becker
+   *
+   * @internal
+   *   @history 2014-02-17 Kris Becker - Original Version
    */
-  
+
   template <class T, class D> class PointCloudTree {
-  
+
     private:
       // Declaration of the Nanoflann interface for our PointCloud.  Note the
-      // DIM template parameter is defined by the type of distance compution 
-      // function type so the dimensionality of the distance can be 
+      // DIM template parameter is defined by the type of distance compution
+      // function type so the dimensionality of the distance can be
       // specified at compile time
       typedef nanoflann::KDTreeSingleIndexAdaptor<
-                            nanoflann::L2_Simple_Adaptor<double, PointCloud<T,D> >, 
+                            nanoflann::L2_Simple_Adaptor<double, PointCloud<T,D> >,
                             PointCloud<T,D>, D::Dimension >  PcKdTree_t;
-    
+
     public:
       /**
-       * @brief Constructor of PointCloudTree for the kd-tree point representaion 
-       *  
-       * This constructor accepts a pointer to a prebuilt PointCloud.  Once provided, 
-       * this object takes over complete management/use of the PointCloud.  The nDim 
-       * parameter sets the dimensionality of the point.  Valid dimensions of the 
-       * kd-tree is 2 or 3.  The data provided in the PointCloud must support 2D or 
-       * 3D Euclidean distances.  The parameter, leafNodes, allows developers to 
-       * specify the number of leaves on each node.  See 
-       * https://code.google.com/p/nanoflann/#2._Any_help_choosing_the_KD-tree_parameters? 
-       * for additional details. 
-       * 
+       * @brief Constructor of PointCloudTree for the kd-tree point representaion
+       *
+       * This constructor accepts a pointer to a prebuilt PointCloud.  Once provided,
+       * this object takes over complete management/use of the PointCloud.  The nDim
+       * parameter sets the dimensionality of the point.  Valid dimensions of the
+       * kd-tree is 2 or 3.  The data provided in the PointCloud must support 2D or
+       * 3D Euclidean distances.  The parameter, leafNodes, allows developers to
+       * specify the number of leaves on each node.  See
+       * https://code.google.com/p/nanoflann/#2._Any_help_choosing_the_KD-tree_parameters?
+       * for additional details.
+       *
        * @history 2014-03-03 Kris Becker Original Version
-       * 
-       * @param pc        Pointer to PointCloud to build the kd-tree from.  This 
+       *
+       * @param pc        Pointer to PointCloud to build the kd-tree from.  This
        *                  object takes complete ownership of the PointCloud pointer.
        * @param leafNodes Maximum number of leaves stored at each kd-tree node
        */
       PointCloudTree(PointCloud<T,D> *pc, const int &leafNodes = 10) : m_pc(pc),
         m_kd_index(D::Dimension, *pc, nanoflann::KDTreeSingleIndexAdaptorParams(leafNodes)) {
         m_kd_index.buildIndex();
-      } 
-    
+      }
+
       /** Destructor  */
       virtual ~PointCloudTree() { }
-    
+
       /** Perform radius query for points in kilometer units */
-      PointCloudSearchResult<T,D> radius_query(const T &point, 
-                                               const double &radius_sq) { 
+      PointCloudSearchResult<T,D> radius_query(const T &point,
+                                               const double &radius_sq) {
         std::vector<std::pair<size_t, double> > matches;
-    
-        int n = m_kd_index.radiusSearch(point.array(), radius_sq, matches, 
+
+        int n = m_kd_index.radiusSearch(point.array(), radius_sq, matches,
                                         nanoflann::SearchParams());
         return (PointCloudSearchResult<T,D>(point, radius_sq, matches, m_pc, n));
       }
-    
+
       /** Perform nearest set of points from its neighbors   */
-      PointCloudSearchResult<T,D> neighbor_query(const T &point, 
-                                                  const int &neighbors) { 
+      PointCloudSearchResult<T,D> neighbor_query(const T &point,
+                                                  const int &neighbors) {
         QVector<size_t> indices(neighbors);
         QVector<double> distances(neighbors);
-        m_kd_index.knnSearch(point.array(), neighbors, indices.data(), 
+        m_kd_index.knnSearch(point.array(), neighbors, indices.data(),
                              distances.data());
-        return (PointCloudSearchResult<T,D>(point, neighbors, indices, distances, m_pc)); 
+        return (PointCloudSearchResult<T,D>(point, neighbors, indices, distances, m_pc));
       }
-    
+
       /** Returns a reference to the point cloud */
       inline const PointCloud<T,D> &cloud() const { return ( *m_pc ); }
-  
+
     private:
       QSharedPointer<PointCloud<T,D> >  m_pc;
       PcKdTree_t                        m_kd_index;
-  
+
   };
 
 };  // namespace Isis
diff --git a/isis/src/control/apps/cnet2dem/main.cpp b/isis/src/control/apps/cnet2dem/main.cpp
index 25716043273c089ca6cd4fce9ef0d581a2e13dce..94e994b008af37dbf45e2207f37400fc7dfbab99 100644
--- a/isis/src/control/apps/cnet2dem/main.cpp
+++ b/isis/src/control/apps/cnet2dem/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QFile>
@@ -38,11 +46,11 @@ using namespace Isis;
 // Control network manager
 typedef QList<QSharedPointer<ControlNet> >    ControlNetList;
 
-/** 
+/**
  * Functor for normalized 3D-to-2D Euclidean distances
- * 
+ *
  * @author 2015-03-14 Kris Becker
- * 
+ *
  * @internal
  *   @history 2015-03-14 Kris Becker - Original version.
  */
@@ -76,9 +84,9 @@ public:
                       datum2.x(), datum2.y(), datum2.z()) );
   }
 
-  inline double normalize(const double dx1, const double dy1, const double dz1, 
-                          const double dx2, const double dy2, const double dz2) 
-                          const { 
+  inline double normalize(const double dx1, const double dy1, const double dz1,
+                          const double dx2, const double dy2, const double dz2)
+                          const {
     double scale = m_znorm / radius(dx2, dy2, dz2);
     double nx = dx2 * scale;
     double ny = dy2 * scale;
@@ -88,7 +96,7 @@ public:
 
   inline double distance(const double dx1, const double dy1, const double dz1,
                          const double dx2, const double dy2, const double dz2)
-                         const { 
+                         const {
     double dx = dx1 - dx2;
     double dy = dy1 - dy2;
     double dz = dz1 - dz2;
@@ -125,7 +133,7 @@ typedef PointCloudSearchResult<PointType, DistanceType> ResultType;
 
 
 void IsisMain() {
- 
+
   // We will be processing by line
   ProcessByLine p;
   UserInterface &ui = Application::GetUserInterface();
@@ -141,8 +149,8 @@ void IsisMain() {
   DatumFunctoidList functors = dfactory->create(algorithm);
 
   QStringList cnetfiles;
-  if ( ui.WasEntered("CNET") ) { 
-    cnetfiles.append(ui.GetAsString("CNET")); 
+  if ( ui.WasEntered("CNET") ) {
+    cnetfiles.append(ui.GetAsString("CNET"));
   }
 
   if ( ui.WasEntered("CNETLIST") ) {
@@ -158,7 +166,7 @@ void IsisMain() {
     throw IException(IException::User, mess, _FILEINFO_);
   }
   // Create the point cloud container and load the control networks
-  QScopedPointer<CNetPointCloud> cloud(new CNetPointCloud()); 
+  QScopedPointer<CNetPointCloud> cloud(new CNetPointCloud());
 
   // Collect some stuff from input nets for the output net
   QString netid;
@@ -177,10 +185,10 @@ void IsisMain() {
     int npoints(0);
     QList<ControlPoint *> points = cnet->take();
     BOOST_FOREACH ( ControlPoint *point, points) {
-      ControlPointCloudPt cpt(point, ControlPointCloudPt::Ground, 
+      ControlPointCloudPt cpt(point, ControlPointCloudPt::Ground,
                               ControlPointCloudPt::Exclusive);
-      if ( cpt.isValid() ) { 
-        cloud->addPoint(cpt); 
+      if ( cpt.isValid() ) {
+        cloud->addPoint(cpt);
         npoints++;
       }
     }
@@ -189,7 +197,7 @@ void IsisMain() {
 
     // Instead of having to save the ControlNet instances, we take ownership
     // of all the points from ControlNet and turn it over to the cloud...
-    // 
+    //
     //  cnetlist.append( QSharedPointer<ControlNet> ( cnet.take() ) );
   }
   std::cout << "\nTotal " << cloud->size() << " of " << allPoints << "\n";
@@ -232,7 +240,7 @@ void IsisMain() {
   // Only worry about this if a range search is requested
   if ( radial_search) {
     if (ui.WasEntered("DISTANCE")) {
-      search_radius = ui.GetDouble("DISTANCE"); 
+      search_radius = ui.GetDouble("DISTANCE");
     }
     else {
       // Compute range from center of pixel to corner in meters
@@ -268,11 +276,11 @@ void IsisMain() {
   mapper.SetMaximumSteps(tile.Bricks());
   mapper.CheckStatus();
 
- //  Process data using 3-D brick 
+ //  Process data using 3-D brick
   int npixels = tsamps * tlines;
   int nbands = tile.BandDimension();
   SurfacePoint point;
-  
+
   for ( int brick = 1 ; brick <= tile.Bricks() ; brick++ ) {
     tile.SetBrick(brick);
 
@@ -286,14 +294,14 @@ void IsisMain() {
       QVector<double> datum(nbands, Null);
 
       //  Map only valid projection translation
-      if ( (samp <= csamps) && (line <= clines) && 
+      if ( (samp <= csamps) && (line <= clines) &&
            ( tproj->SetWorld(samp, line) ) ) {
-#if 0        
+#if 0
         std::cout << "Line: " << line << "  Sample: " << samp << "\n";
-        std::cout << "Lat:  " << tproj->UniversalLatitude() 
+        std::cout << "Lat:  " << tproj->UniversalLatitude()
                   << " Long: " << tproj->UniversalLongitude() << "\n";
 #endif
-        
+
         // Trim if requested
         bool mapit(true);
         if ( ( trim ) && ( tproj->HasGroundRange() ) ) {
@@ -305,11 +313,11 @@ void IsisMain() {
 
         // Plot it only if its within mapping boundary conditions
         if ( mapit ) {
-          double lat = tproj->UniversalLatitude(); 
+          double lat = tproj->UniversalLatitude();
           double lon = tproj->UniversalLongitude();
           double radius = tproj->LocalRadius(lat);
 
-          point.SetSphericalCoordinates(Latitude(lat, Angle::Degrees), 
+          point.SetSphericalCoordinates(Latitude(lat, Angle::Degrees),
                                         Longitude(lon, Angle::Degrees),
                                         Distance(radius, Distance::Meters));
 
@@ -321,15 +329,15 @@ void IsisMain() {
                                   "MapPoint");
 
           // There are several combinations to consider
-          //    1) RADIAL search from RANGE <meters> at the lat/lon pixel center 
-          //    2) NEIGHBOR search selecting the NEIGHBORS closest to the center 
+          //    1) RADIAL search from RANGE <meters> at the lat/lon pixel center
+          //    2) NEIGHBOR search selecting the NEIGHBORS closest to the center
           //    3) BOTH searches requested will apply the RADIAL search first, then
-          //        and only if MINPOINTS points resulting from the RADIAL 
-          //        search are within RANGE <meters>, otherwise a NEIGHBOR 
+          //        and only if MINPOINTS points resulting from the RADIAL
+          //        search are within RANGE <meters>, otherwise a NEIGHBOR
           //        search is performed.
           ResultType results;
           if ( both_searches ) {
-            results = cloud_t.radius_query(cpt, search_radius_sq); 
+            results = cloud_t.radius_query(cpt, search_radius_sq);
             if ( minpoints > results.size() ) {
               results = cloud_t.neighbor_query(cpt, neighbors);
             }
@@ -392,4 +400,3 @@ void IsisMain() {
 
   p.EndProcess();
 }
-
diff --git a/isis/src/control/apps/cnet2mat/main.cpp b/isis/src/control/apps/cnet2mat/main.cpp
index 4795040267637a15e3f5bc35c0d0780886ff2b7b..49bb72cbf5ea4d8ddf068b180b05777dee95c805 100644
--- a/isis/src/control/apps/cnet2mat/main.cpp
+++ b/isis/src/control/apps/cnet2mat/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <map>
diff --git a/isis/src/control/apps/cnetadd/main.cpp b/isis/src/control/apps/cnetadd/main.cpp
index 7fd2d7eae95f3b881529f1fa6e7655092ebcae58..ddebf1d7e6dc9aa42460aae4f30a6189111dce22 100644
--- a/isis/src/control/apps/cnetadd/main.cpp
+++ b/isis/src/control/apps/cnetadd/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <map>
@@ -415,4 +423,3 @@ QList<ControlPoint *> getValidPoints(Cube &cube, STRtree &coordTree) {
 
   return results;
 }
-
diff --git a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.cpp b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.cpp
index 137d7bb3820723f0e553ca6c8ec54c26a55a088e..b7f4b05d73d7788e5736dc2209126a5a0953782f 100644
--- a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.cpp
+++ b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "cnetbin2pvl.h"
 
 using namespace std;
diff --git a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.h b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.h
index 6e2e2316834545a14b5b00b9ab270daabbe981b6..725f9f0ad07ceb6a9272c265c4135e3571b6a5a3 100644
--- a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.h
+++ b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.h
@@ -1,6 +1,14 @@
 #ifndef cnetbin2pvl_h
 #define cnetbin2pvl_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 #include "ControlNet.h"
 #include "Progress.h"
diff --git a/isis/src/control/apps/cnetbin2pvl/main.cpp b/isis/src/control/apps/cnetbin2pvl/main.cpp
index d3e3083fb5353f4777bcb3d05077c88ce3123945..70b4e2c88571662462c7803cf844c4b19b4e5324 100644
--- a/isis/src/control/apps/cnetbin2pvl/main.cpp
+++ b/isis/src/control/apps/cnetbin2pvl/main.cpp
@@ -1,5 +1,13 @@
 #include "Isis.h"
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "cnetbin2pvl.h"
 #include "Application.h"
 
diff --git a/isis/src/control/apps/cnetcheck/cnetcheck.cpp b/isis/src/control/apps/cnetcheck/cnetcheck.cpp
index 3479d424ac22fb564adf18a086b3904c9180330e..195acf4955297ff92d13fef072748329a807214d 100644
--- a/isis/src/control/apps/cnetcheck/cnetcheck.cpp
+++ b/isis/src/control/apps/cnetcheck/cnetcheck.cpp
@@ -1,3 +1,12 @@
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include <sstream>
 #include <set>
@@ -65,24 +74,24 @@ namespace Isis {
   QString g_delimiter;
 
   /**
-   * check control network validity 
+   * check control network validity
    *
-   * @param ui UserInterface object containing parameters 
-   * @param(out) log The Pvl that outlier results logged to check 
+   * @param ui UserInterface object containing parameters
+   * @param(out) log The Pvl that outlier results logged to check
    */
   QString cnetcheck(UserInterface &ui, Pvl *log) {
    ControlNet innet(ui.GetFileName("CNET"));
    FileList inlist(ui.GetFileName("FROMLIST"));
-   
+
    return cnetcheck(innet, inlist, ui, log);
   }
 
   /**
-   * check control network validity 
+   * check control network validity
    *
-   * @param innet input control network 
-   * @param inlist input file list 
-   * @param ui UserInterface object containing parameters 
+   * @param innet input control network
+   * @param inlist input file list
+   * @param ui UserInterface object containing parameters
    * @param(out) log The Pvl that outlier results logged to
    */
   QString cnetcheck(ControlNet &innet, FileList &inlist, UserInterface &ui, Pvl *log) {
@@ -248,9 +257,9 @@ namespace Isis {
     // Output the results to screen and files accordingly
 
     PvlGroup results("Results");
-    
-    QString networkName = ui.WasEntered("CNET") ? FileName(ui.GetFileName("CNET")).name() : innet.GetNetworkId(); 
-      
+
+    QString networkName = ui.WasEntered("CNET") ? FileName(ui.GetFileName("CNET")).name() : innet.GetNetworkId();
+
     stringstream ss(stringstream::in | stringstream::out);
 
     results.addKeyword(PvlKeyword("Islands", toString((BigInt)islands.size())));
@@ -448,10 +457,10 @@ namespace Isis {
     ss << "----------------------------------------" \
        "----------------------------------------" << endl << endl;
     QString logstr = ss.str().c_str();
-    
+
     if (log){
       log->addGroup(results);
-    } 
+    }
 
     if (!ui.IsInteractive()) {
       std::cout << ss.str();
diff --git a/isis/src/control/apps/cnetcheck/cnetcheck.h b/isis/src/control/apps/cnetcheck/cnetcheck.h
index a9ebd2e7de24a34c21e036fd3e48c54c6d9d59a4..55d28c55e0be79014be2a721c7ac304338661053 100644
--- a/isis/src/control/apps/cnetcheck/cnetcheck.h
+++ b/isis/src/control/apps/cnetcheck/cnetcheck.h
@@ -1,6 +1,14 @@
 #ifndef cnetcheck_h
 #define cnetcheck_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QString>
 
 #include "UserInterface.h"
diff --git a/isis/src/control/apps/cnetcheck/main.cpp b/isis/src/control/apps/cnetcheck/main.cpp
index 20b043c5366b085cb9d534662580145b613f1d42..3af4678ddb467f1cc42a1c0604ffeb1ce5a888ed 100644
--- a/isis/src/control/apps/cnetcheck/main.cpp
+++ b/isis/src/control/apps/cnetcheck/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "cnetcheck.h"
@@ -15,7 +23,7 @@ void IsisMain() {
 
   try {
     QString results = cnetcheck(ui, &appLog);
-    
+
     if (ui.IsInteractive()){
       Application::GuiLog(results);
     }
diff --git a/isis/src/control/apps/cnetcombinept/ControlPointMerger.cpp b/isis/src/control/apps/cnetcombinept/ControlPointMerger.cpp
index 9bac9193cf1b6d2c9d06345a8bfc51547bb600ac..3efd81371631141ea32ba0e8481e9d5c42ac1109 100644
--- a/isis/src/control/apps/cnetcombinept/ControlPointMerger.cpp
+++ b/isis/src/control/apps/cnetcombinept/ControlPointMerger.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.0 $
- * $Date: 2014/02/27 18:49:25 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "ControlPointMerger.h"
 
diff --git a/isis/src/control/apps/cnetcombinept/ControlPointMerger.h b/isis/src/control/apps/cnetcombinept/ControlPointMerger.h
index 5776b03e4d41e4395742841e051183fc7f979956..ad61c0b2c22674541e00ec8b269acb7a892c456c 100644
--- a/isis/src/control/apps/cnetcombinept/ControlPointMerger.h
+++ b/isis/src/control/apps/cnetcombinept/ControlPointMerger.h
@@ -1,26 +1,13 @@
 #ifndef ControlPointMerger_h
 #define ControlPointMerger_h
-/**
- * @file
- * $Revision: 1.0 $
- * $Date: 2014/02/27 18:49:25 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QtGlobal>
 #include <QList>
diff --git a/isis/src/control/apps/cnetcombinept/MeasurePoint.h b/isis/src/control/apps/cnetcombinept/MeasurePoint.h
index 682b6475cdf2241173281f7926e9f82eb85aeeb4..0da636ffc213729e6f6f8b9cccff782b0d21cdb8 100644
--- a/isis/src/control/apps/cnetcombinept/MeasurePoint.h
+++ b/isis/src/control/apps/cnetcombinept/MeasurePoint.h
@@ -1,26 +1,13 @@
 #ifndef MeasurePoint_h
 #define MeasurePoint_h
-/**
- * @file
- * $Revision: 1.0 $ 
- * $Date: 2014/02/27 18:49:25 $ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <cmath>
 
@@ -37,13 +24,13 @@ namespace Isis {
 
 /**
  * @brief ControlPoint class for use in PointCloud datasets
- *  
+ *
  *  The ControlPoint container is required to not change its content for the
  *  duration of use of the nanoflann kd-tree built from the points.
- *  
+ *
  * @author  2015-10-11 Kris Becker
- *  
- * @internal 
+ *
+ * @internal
  *   @history 2015-10-11 Kris Becker - Original Version
  *   @history 2016-12-06 Jesse Mapel - Updated documentation.  References #4558.
  */
@@ -58,13 +45,13 @@ class MeasurePoint {
 
     /**
      * Constructs a MeasurePoint from a measure.
-     * 
+     *
      * @param measure  The measure that the MeasurePoint represents.
-     * @param weight   The weight of the MeasurePoint in the 
+     * @param weight   The weight of the MeasurePoint in the
      */
-    MeasurePoint(ControlMeasure *measure, const double &weight = 1.0) : 
+    MeasurePoint(ControlMeasure *measure, const double &weight = 1.0) :
                  m_data(new ControlMeasureData(measure, weight) ) {
-      m_data->m_isvalid = validMeasure(); 
+      m_data->m_isvalid = validMeasure();
     }
 
 
@@ -76,7 +63,7 @@ class MeasurePoint {
 
     /**
      * Determines if the MeasurePoint's parent control point is valid.
-     * 
+     *
      * @return @b bool If the measure's parent control point is valid.
      */
     inline bool validPoint() const {
@@ -84,17 +71,17 @@ class MeasurePoint {
       BOOST_ASSERT ( m != 0 );
       ControlPoint *p = m->Parent();
       BOOST_ASSERT ( p != 0 );
-      return (!(p->IsIgnored() || p->IsRejected() || p->IsEditLocked() || p->IsInvalid()) ); 
+      return (!(p->IsIgnored() || p->IsRejected() || p->IsEditLocked() || p->IsInvalid()) );
     }
 
 
     /**
      * If the MeasurePoint and parent control point are valid.
-     * 
+     *
      * @return @b bool If the MeasurePoint and parent control point are both valid.
      */
     inline bool isValid() const {
-      return ( m_data->m_isvalid && validPoint() ); 
+      return ( m_data->m_isvalid && validPoint() );
     }
 
 
@@ -109,7 +96,7 @@ class MeasurePoint {
 
     /**
      * Returns the size of the MeasurePoint.
-     * 
+     *
      * @return @b int Always one.
      */
     inline int size() const {
@@ -119,7 +106,7 @@ class MeasurePoint {
 
     /**
      * Returns the measure's point ID
-     * 
+     *
      * @return @b QString The point ID of the measure's parent control point.
      */
     inline QString id() const {
@@ -129,7 +116,7 @@ class MeasurePoint {
 
     /**
      * Returns the MeasurePoint's measure.
-     * 
+     *
      * @return @b ControlMeasure* A pointer to the contained measure.
      */
     inline const ControlMeasure *data() const {
@@ -139,7 +126,7 @@ class MeasurePoint {
 
     /**
      * Returns the parent control point.
-     * 
+     *
      * @return @b ControlPoint* A pointer to the parent control point.
      */
     inline ControlPoint *getPoint() const {
@@ -149,7 +136,7 @@ class MeasurePoint {
 
     /**
      * Returns the serial number of the cube the measure is on.
-     * 
+     *
      * @return @b QString The serial number of the cube the measure is on.
      */
     inline QString getSerialNumber() const {
@@ -159,7 +146,7 @@ class MeasurePoint {
 
     /**
      * Returns the MeasurePoint's x coordinate.
-     * 
+     *
      * @return @b double the MeasurePoint's x coordinate.
      */
     inline double x() const {
@@ -169,17 +156,17 @@ class MeasurePoint {
 
     /**
      * Returns the MeasurePoint's y coordinate.
-     * 
+     *
      * @return @b double the MeasurePoint's y coordinate.
      */
-    inline double y() const { 
+    inline double y() const {
       return ( m_data->m_xyz[1] );
     }
 
 
     /**
      * Returns the MeasurePoint's z coordinate.
-     * 
+     *
      * @return @b double the MeasurePoint's z coordinate.
      */
     inline double z() const {
@@ -189,7 +176,7 @@ class MeasurePoint {
 
     /**
      * Returns the MeasurePoint's weight.
-     * 
+     *
      * @return @b double the MeasurePoint's weight.
      */
     inline double w() const {
@@ -199,7 +186,7 @@ class MeasurePoint {
 
     /**
      * Returns the coordinates and weight of the MeasurePoint.
-     * 
+     *
      * @return @b double* A pointer to an array containing (in order)
      *                    the x, y, z, and weight of the MeasurePoint.
      */
@@ -211,9 +198,9 @@ class MeasurePoint {
     /**
      * Determines if the measures contained by this MeasurePoint and
      * another MeasurePoint are the same.
-     * 
+     *
      * @param other The MeasurePoint to compare against.
-     * 
+     *
      * @return @b bool If the measures are the same.
      */
     inline bool operator==(const MeasurePoint &other) const {
@@ -224,9 +211,9 @@ class MeasurePoint {
     /**
      * Determines if the measures contained by this MeasurePoint and
      * another MeasurePoint are not the same.
-     * 
+     *
      * @param other The MeasurePoint to compare against.
-     * 
+     *
      * @return @b bool If the measures are not the same.
      */
     inline bool operator!=(const MeasurePoint &other) const {
@@ -237,12 +224,12 @@ class MeasurePoint {
 
     /**
      * Data wrapper class for ControlMeasures.
-     * 
+     *
      * @see QSharedData
-     *  
+     *
      * @author  2015-10-11 Kris Becker
-     *  
-     * @internal 
+     *
+     * @internal
      *   @history 2015-10-11 Kris Becker - Original Version
      *   @history 2016-12-06 Jesse Mapel - Updated documentation.  References #4558.
      */
@@ -252,7 +239,7 @@ class MeasurePoint {
         /**
          * Constructs and empty ControlMeasureData.
          */
-        ControlMeasureData() : QSharedData(), m_measure(0), 
+        ControlMeasureData() : QSharedData(), m_measure(0),
                             m_weight(1.0), m_xyz(), m_isvalid(false)  {
           getImageCoordinates();
         }
@@ -260,12 +247,12 @@ class MeasurePoint {
 
         /**
          * Constructs a ControlMeasureData from a measure.
-         * 
+         *
          * @param measure The ControlMeasure to wrap.
          * @param weight The weight for the measure. Defaults to 1.0.
          */
-        ControlMeasureData(ControlMeasure *measure, const double &weight = 1.0) : 
-                         QSharedData(), m_measure(measure), m_weight(weight), 
+        ControlMeasureData(ControlMeasure *measure, const double &weight = 1.0) :
+                         QSharedData(), m_measure(measure), m_weight(weight),
                          m_xyz(), m_isvalid(false) {
           getImageCoordinates();
         }
@@ -315,13 +302,13 @@ class MeasurePoint {
 
     /**
      * Returns if the internal measure is valid.
-     * 
+     *
      * @return @b bool If the internal measure is valid.
      */
     inline bool validMeasure() const {
       ControlMeasure *m = m_data->m_measure;
       BOOST_ASSERT ( m != 0 );
-      return (!(m->IsIgnored() || m->IsRejected()) ); 
+      return (!(m->IsIgnored() || m->IsRejected()) );
     }
 
 };
diff --git a/isis/src/control/apps/cnetcombinept/PointCloud.h b/isis/src/control/apps/cnetcombinept/PointCloud.h
index 77a1fbb8d7c05c66a512fbc3ba5630283b41d652..e125931b6d5e4f8dafd9d68c9eab679f91e90165 100644
--- a/isis/src/control/apps/cnetcombinept/PointCloud.h
+++ b/isis/src/control/apps/cnetcombinept/PointCloud.h
@@ -1,38 +1,25 @@
 #ifndef PointCloud_h
 #define PointCloud_h
-/**
- * @file
- * $Revision: 1.0 $ 
- * $Date: 2014/02/27 18:49:25 $ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QtGlobal>
 #include <QVector>
 
 namespace Isis {
 
-/** 
+/**
  *  Functor to compute 2-d Euclidean distances
- *  
+ *
  * @author 2014-02-17 Kris Becker
- *  
- * @internal 
+ *
+ * @internal
  *   @history 2014-02-17 Kris Becker - Original Version
  *   @history 2016-12-06 Jesse Mapel - Updated documentation. References #4558.
  */
@@ -55,7 +42,7 @@ public:
 
   /**
    * Returns the dimension of the distance metric.
-   * 
+   *
    * @return @b int Always 2.
    */
   inline int dimension() const {
@@ -65,10 +52,10 @@ public:
 
   /**
    * Computes the two dimensional distance between two points.
-   * 
+   *
    * @param datum1 The first point
    * @param datum2 The second point
-   * 
+   *
    * @return @b double The distance between the two points.
    */
   inline double operator()(const T &datum1, const T &datum2) const {
@@ -80,10 +67,10 @@ public:
 
   /**
    * Computes the two dimensional distance between two points.
-   * 
+   *
    * @param datum1 The first point as a double array
    * @param datum2 The second point
-   * 
+   *
    * @return @b double The distance between the two points.
    */
   inline double operator()(const double *datum1, const T &datum2) const {
@@ -95,53 +82,53 @@ public:
 
 
 /**
- * @brief Point cloud adapter class for nanoflann kd-tree interface 
- *  
- * This class provides the point cloud class for Point3d clouds that interface 
- * with the nanoflann (http://code.google.com/p/nanoflann/) kd-tree fast search 
- * query library. The reference for this approach can be found in an example 
- * found at 
+ * @brief Point cloud adapter class for nanoflann kd-tree interface
+ *
+ * This class provides the point cloud class for Point3d clouds that interface
+ * with the nanoflann (http://code.google.com/p/nanoflann/) kd-tree fast search
+ * query library. The reference for this approach can be found in an example
+ * found at
  * http://nanoflann.googlecode.com/svn/trunk/examples/pointcloud_kdd_radius.cpp.
- *  
- * This class is designed to accept a reference to a container of 3-d points. 
- * In addition, this class accesses individual points from PointCloud using a 
- * vector component operator so as to standardize and complete this interface: 
- *  
+ *
+ * This class is designed to accept a reference to a container of 3-d points.
+ * In addition, this class accesses individual points from PointCloud using a
+ * vector component operator so as to standardize and complete this interface:
+ *
  * @code
  *   double x() const;  // X component of point
  *   double y() const;  // Y component of point
  *   double z() const;  // Z component of point
  *   double w() const;  // Optional weight of point (default should be 1.0)
  * @endcode
- *  
+ *
  *  The point container is required to not change its content for the duration
  *  of use of the nanoflann kd-tree built from the points. Because of this,
  *  there is no clear() method to discard existing points.
- *  
+ *
  *  This class supports 2D and 3D Euclidean distant calculations. This option is
  *  specified in the PointCloudTree class constructor when building the kd-tree
  *  index.
- *  
+ *
  *  The routines kdtree_get_point_count(), kdtree_distance(), kdtree_get_pt()
  *  and kdtree_get_bbox() (default implementation) satisfy the needs of the
  *  Nanoflann kd-tree template library.
- *  
+ *
  *  This class is not a template, but all its methods are inlined for efficiency
  *  reasons. This implemetation approach allows us to take best advantage of the
  *  optimization that the Nanoflann library offers.
- *  
+ *
  *  The Point3d class is also optimized in the same fashion and offers a
  *  flexible point base class to complete the implementation.
- *  
+ *
  *  This point cloud class is designed with the body-fixed coordinate system in
  *  mind. Therfore, the units of the point vectors is assumed to be kilometers
  *  but this is not required - as long as Euclidean distances apply to the point
  *  dataset, any 3D vector representation could utilize this class.
- *  
+ *
  * @author 2014-02-17 Kris Becker
- *  
- * @internal 
- *   @history 2014-02-17 Kris Becker - Original Version 
+ *
+ * @internal
+ *   @history 2014-02-17 Kris Becker - Original Version
  */
 template <class T > class PointCloud {
   public:
@@ -154,7 +141,7 @@ template <class T > class PointCloud {
 
     /**
      * Constructs a PointCloud with a given ID.
-     * 
+     *
      * @param id The ID of the PointCloud.
      */
     explicit PointCloud(const QString &id) :  m_id(id), m_points(), m_distance()  { }
@@ -163,36 +150,36 @@ template <class T > class PointCloud {
     /**
      * Constructs a PointCloud with a given ID and
      * space for a given number of points reserved.
-     * 
+     *
      * @param npoints The number of points to reserve space for.
-     * @param id The ID of the PointCloud.  Defaults to "PointCloud". 
+     * @param id The ID of the PointCloud.  Defaults to "PointCloud".
      */
-    PointCloud(const int &npoints, const QString &id = "PointCloud") : 
-               m_id(id), m_points(), m_distance() { 
-      m_points.reserve(npoints); 
+    PointCloud(const int &npoints, const QString &id = "PointCloud") :
+               m_id(id), m_points(), m_distance() {
+      m_points.reserve(npoints);
     }
 
 
     /**
      * Constructs a PointCloud with a given ID and set of points.
-     * 
+     *
      * @param points The set of points to add to the PointCloud.
-     * @param id The ID of the PointCloud.  Defaults to "PointCloud". 
+     * @param id The ID of the PointCloud.  Defaults to "PointCloud".
      */
-    PointCloud(const QVector<T> &points, const QString &id = "PointCloud") : 
+    PointCloud(const QVector<T> &points, const QString &id = "PointCloud") :
                m_id(id), m_points(points), m_distance() { }
 
 
     /**
      * Constructs a PointCloud with a given ID and set measures.
      * The measures will be used to construct the internal set of points.
-     * 
+     *
      * @param points The set of measures to add to the PointCloud.
-     * @param id The ID of the PointCloud.  Defaults to "PointCloud". 
+     * @param id The ID of the PointCloud.  Defaults to "PointCloud".
      */
-    PointCloud(const QList<ControlMeasure *> &points, 
-               const QString &id = "PointCloud") : 
-               m_id(id), m_points(), m_distance() { 
+    PointCloud(const QList<ControlMeasure *> &points,
+               const QString &id = "PointCloud") :
+               m_id(id), m_points(), m_distance() {
       for (int i = 0 ; i < points.size() ; i++ ) {
         m_points.push_back( T(points[i]) );
       }
@@ -207,7 +194,7 @@ template <class T > class PointCloud {
 
     /**
      * Returns the size of the PointCloud.
-     * 
+     *
      * @return @b int The number of points in the PointCloud.
      */
     inline int size() const {
@@ -217,7 +204,7 @@ template <class T > class PointCloud {
 
     /**
      * Returns the PointCloud's ID.
-     * 
+     *
      * @return @b QString The PointCloud's ID.
      */
     inline QString identifier() const {
@@ -227,7 +214,7 @@ template <class T > class PointCloud {
 
     /**
      * Adds a new point to the list
-     * 
+     *
      * @param point The point to add.
      */
     inline void addPoint(const T &point) {
@@ -237,9 +224,9 @@ template <class T > class PointCloud {
 
     /**
      * Return a reference to the point at a given index.
-     * 
+     *
      * @param idx The index of the point to return.
-     * 
+     *
      * @return @b T& A constant reference to the point.
      */
     inline const T &point(const size_t idx) const {
@@ -251,10 +238,10 @@ template <class T > class PointCloud {
 
     /**
      * Returns the Euclidean distance between two points.
-     * 
+     *
      * @param first The first point.
      * @param second The second point.
-     * 
+     *
      * @return @b double The squared Euclidean distance between first and second.
      */
     inline double distance( const T &first, const T &second ) const {
@@ -262,9 +249,9 @@ template <class T > class PointCloud {
     }
 
 
-    /** 
+    /**
      * Returns the number of points in the PointCloud.
-     * 
+     *
      * @return @b size_t The number of points in the PointCloud.
      */
     inline size_t kdtree_get_point_count() const {
@@ -274,16 +261,16 @@ template <class T > class PointCloud {
 
   /**
    * @brief Return Euclidean distance from a source point to the indexed point
-   *  
+   *
    * This method returns the Euclidean (L2) distance from a dataset point and a
-   * source point (p1).  We only use X and Y components to compute this 
-   * distance since our objective is to identify points in 2-d space. 
-   * 
+   * source point (p1).  We only use X and Y components to compute this
+   * distance since our objective is to identify points in 2-d space.
+   *
    * @author 2014-02-27 Kris Becker
-   * 
+   *
    * @param p1      3-vector of the source point
    * @param idx_p2  Index into point data set contained herein
-   * 
+   *
    * @return @b double Returns the squared distance - not the square root!
    */
     inline double kdtree_distance(const double *p1, const size_t idx_p2,
@@ -295,16 +282,16 @@ template <class T > class PointCloud {
 
 
   /**
-   * @brief Returns a value for a single dimemsion of a vector 
-   *  
-   * This method provides a simple interface to each vector element in the point 
+   * @brief Returns a value for a single dimemsion of a vector
+   *
+   * This method provides a simple interface to each vector element in the point
    * cloud.
-   * 
+   *
    * @history 2014-03-03 Kris Becker
-   * 
+   *
    * @param idx Index of the point to get element from
-   * @param dim The index (0 - 2)of the ith element of the vector 
-   * 
+   * @param dim The index (0 - 2)of the ith element of the vector
+   *
    * @return @b double Value at the specfied vector point index
    */
     inline double kdtree_get_pt(const size_t idx, int dim) const {
@@ -314,16 +301,16 @@ template <class T > class PointCloud {
     }
 
 
-    /** 
+    /**
      *  Let nanoflann range algorithm compute the bounding box
-     *  
+     *
      * @author 2014-02-17 Kris Becker
-     *  
-     * @internal 
-     *   @history 2014-02-17 Kris Becker - Original Version 
+     *
+     * @internal
+     *   @history 2014-02-17 Kris Becker - Original Version
      */
-    template <class BBOX> bool kdtree_get_bbox(BBOX &bb) const { 
-      return (false); 
+    template <class BBOX> bool kdtree_get_bbox(BBOX &bb) const {
+      return (false);
     }
 
   private:
diff --git a/isis/src/control/apps/cnetcombinept/PointCloudTree.h b/isis/src/control/apps/cnetcombinept/PointCloudTree.h
index ddaf7cfb59157f0fe08d9cffd5b014707b31ae00..760230d13e569ac23cd182a74b489647076bff09 100644
--- a/isis/src/control/apps/cnetcombinept/PointCloudTree.h
+++ b/isis/src/control/apps/cnetcombinept/PointCloudTree.h
@@ -1,26 +1,13 @@
 #ifndef PointCloudTree_h
 #define PointCloudTree_h
-/**
- * @file
- * $Revision: 1.0 $ 
- * $Date: 2014/02/27 18:49:25 $ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <cstdlib>
 #include <vector>
@@ -35,41 +22,41 @@
 namespace Isis {
 
 /**
- * @brief Point cloud kd-tree class using the nanoflann kd-tree library 
- *  
- * This class renders a point cloud in a kd-tree for very fast/efficient point 
- * queries. This particular implementation uses Nanoflann 
- * (http://code.google.com/p/nanoflann/) kd-tree fast search query library. 
- *  
- * This class is specifically designed to support body-fixed 3D point vectors. 
- * Its units are assumed to be kilometers, but is not a requirement. 
- *  
- * PointCloudTree utilizes the PointCloud and Point3d classes to provide fast, 
- * efficient and flexible 3D vector proximity searches.  The implemenations of 
- * these classes are optimized using inline methods to take advantage of the 
- * template optimization of the Nanoflann library. 
- *  
- * Developers can decide at the time of the object instantiation to use 2D or 3D 
- * Euclidean distances in its query with the nDim parameter in the constructor. 
- * This flexibility sacrifices a little compiler optimization using template 
- * parameters (see the -1 KcKdTree_t). The PointCloud classes support both 2D 
+ * @brief Point cloud kd-tree class using the nanoflann kd-tree library
+ *
+ * This class renders a point cloud in a kd-tree for very fast/efficient point
+ * queries. This particular implementation uses Nanoflann
+ * (http://code.google.com/p/nanoflann/) kd-tree fast search query library.
+ *
+ * This class is specifically designed to support body-fixed 3D point vectors.
+ * Its units are assumed to be kilometers, but is not a requirement.
+ *
+ * PointCloudTree utilizes the PointCloud and Point3d classes to provide fast,
+ * efficient and flexible 3D vector proximity searches.  The implemenations of
+ * these classes are optimized using inline methods to take advantage of the
+ * template optimization of the Nanoflann library.
+ *
+ * Developers can decide at the time of the object instantiation to use 2D or 3D
+ * Euclidean distances in its query with the nDim parameter in the constructor.
+ * This flexibility sacrifices a little compiler optimization using template
+ * parameters (see the -1 KcKdTree_t). The PointCloud classes support both 2D
  * and 3D lookups. 2D are common for mapping - 3D for apply restrictions in that
- * dimension for radius queries, particularly. 
- *  
- * It is important to note that the class will take ownership of the PointCloud 
- * pointer required in the constructor.  This futher ensures that the PointCloud 
- * will not be tampered with while the tree index is built from it. 
- *  
- * Query/search results are returned in a PCSearchResult object that can be used 
- * to process the subset of points that satisfy the search parameters.  Along 
+ * dimension for radius queries, particularly.
+ *
+ * It is important to note that the class will take ownership of the PointCloud
+ * pointer required in the constructor.  This futher ensures that the PointCloud
+ * will not be tampered with while the tree index is built from it.
+ *
+ * Query/search results are returned in a PCSearchResult object that can be used
+ * to process the subset of points that satisfy the search parameters.  Along
  * with the results is a shared pointer to the PointCloud.  This provides access
  * to the Point3d points and their data variant for additional processing.
- *  
+ *
  *  These classes are also designed to be thread-safe - maybe.
- *  
+ *
  * @author 2014-02-17 Kris Becker
- *  
- * @internal 
+ *
+ * @internal
  *   @history 2014-02-17 Kris Becker - Original Version
  *   @history 2016-12-06 Jesse Mapel - Updated documentation. References #4558.
  */
@@ -78,30 +65,30 @@ template <class T> class PointCloudTree {
 
  private:
    // Declaration of the Nanoflann interface for our PointCloud.  Note the
-   // DIM template parameter is defined by the type of distance compution 
-   // function type so the dimensionality of the distance can be 
+   // DIM template parameter is defined by the type of distance compution
+   // function type so the dimensionality of the distance can be
    // specified at compile time
   typedef nanoflann::KDTreeSingleIndexAdaptor<
-                        nanoflann::L2_Simple_Adaptor<double, PointCloud<T> >, 
+                        nanoflann::L2_Simple_Adaptor<double, PointCloud<T> >,
                         PointCloud<T>, 2 >  PcKdTree_t;
 
  public:
 
   /**
-   * @brief Constructor of PointCloudTree for the kd-tree point representaion 
-   *  
-   * This constructor accepts a pointer to a prebuilt PointCloud.  Once provided, 
-   * this object takes over complete management/use of the PointCloud.  The nDim 
-   * parameter sets the dimensionality of the point.  Valid dimensions of the 
-   * kd-tree is 2 or 3.  The data provided in the PointCloud must support 2D or 
-   * 3D Euclidean distances.  The parameter, leafNodes, allows developers to 
-   * specify the number of leaves on each node.  See 
-   * https://code.google.com/p/nanoflann/#2._Any_help_choosing_the_KD-tree_parameters? 
-   * for additional details. 
-   * 
+   * @brief Constructor of PointCloudTree for the kd-tree point representaion
+   *
+   * This constructor accepts a pointer to a prebuilt PointCloud.  Once provided,
+   * this object takes over complete management/use of the PointCloud.  The nDim
+   * parameter sets the dimensionality of the point.  Valid dimensions of the
+   * kd-tree is 2 or 3.  The data provided in the PointCloud must support 2D or
+   * 3D Euclidean distances.  The parameter, leafNodes, allows developers to
+   * specify the number of leaves on each node.  See
+   * https://code.google.com/p/nanoflann/#2._Any_help_choosing_the_KD-tree_parameters?
+   * for additional details.
+   *
    * @history 2014-03-03 Kris Becker Original Version
-   * 
-   * @param pc        Pointer to PointCloud to build the kd-tree from.  This 
+   *
+   * @param pc        Pointer to PointCloud to build the kd-tree from.  This
    *                  object takes complete ownership of the PointCloud pointer.
    * @param leafNodes Maximum number of leaves stored at each kd-tree node.
    *                  Defaults to 10 leaves.
@@ -109,7 +96,7 @@ template <class T> class PointCloudTree {
     PointCloudTree(PointCloud<T> *pc, const int &leafNodes = 10) : m_pc(pc),
        m_kd_index(2, *pc, nanoflann::KDTreeSingleIndexAdaptorParams(leafNodes)) {
        m_kd_index.buildIndex();
-    } 
+    }
 
 
     /**
@@ -118,18 +105,18 @@ template <class T> class PointCloudTree {
     virtual ~PointCloudTree() { }
 
 
-    /** 
+    /**
      * Performs a radius query for points in kilometer units.
-     * 
+     *
      * @param point The point to search around.
      * @param radius_sq The square of the radius to search around point.
-     * 
+     *
      * @return @b QList<T> A list of all the points within the radius.
      */
-    QList<T> radius_query(const T &point, const double &radius_sq) { 
+    QList<T> radius_query(const T &point, const double &radius_sq) {
       std::vector<std::pair<size_t, double> > matches;
 
-      (void) m_kd_index.radiusSearch(point.array(), radius_sq, matches, 
+      (void) m_kd_index.radiusSearch(point.array(), radius_sq, matches,
                                      nanoflann::SearchParams());
 
       QList<T> points;
@@ -141,18 +128,18 @@ template <class T> class PointCloudTree {
     }
 
 
-    /** 
+    /**
      * Performs a query for the nearest neighbors to a point.
-     * 
+     *
      * @param point The point to find neighbors around.
      * @param neighbors The number of neighbors to find.
-     * 
+     *
      * @return @b QList<T> A list of the neighbors.
      */
-    QList<T> neighbor_query(const T &point, const int &neighbors) { 
+    QList<T> neighbor_query(const T &point, const int &neighbors) {
       QVector<size_t> indices(neighbors);
       QVector<double> distances(neighbors);
-      m_kd_index.knnSearch(point.array(), neighbors, indices.data(), 
+      m_kd_index.knnSearch(point.array(), neighbors, indices.data(),
                            distances.data());
 
       QList<T> points;
@@ -167,7 +154,7 @@ template <class T> class PointCloudTree {
 
     /**
      * Returns a reference to the point cloud.
-     * 
+     *
      * @return @b A PointCloud<T>& A constant reference to the point cloud.
      */
     inline const PointCloud<T> &cloud() const {
diff --git a/isis/src/control/apps/cnetcombinept/cnetcombinept.cpp b/isis/src/control/apps/cnetcombinept/cnetcombinept.cpp
index 39ff2aed834ca385cc324c4e0b5e70a45e76f737..5af46b2aba235a5852bcee5bda74e33f139aa9b9 100644
--- a/isis/src/control/apps/cnetcombinept/cnetcombinept.cpp
+++ b/isis/src/control/apps/cnetcombinept/cnetcombinept.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "cnetcombinept.h"
 
 #include <QFile>
diff --git a/isis/src/control/apps/cnetcombinept/cnetcombinept.h b/isis/src/control/apps/cnetcombinept/cnetcombinept.h
index 4a776a0c5a83e208326c16bc6cc5c9ca38a624f6..27d0d24707cf88bf5f52d5759ded78ee2eaf04ea 100644
--- a/isis/src/control/apps/cnetcombinept/cnetcombinept.h
+++ b/isis/src/control/apps/cnetcombinept/cnetcombinept.h
@@ -1,6 +1,14 @@
 #ifndef cnetcombinept_h
 #define cnetcombinept_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QString>
 
 #include "Pvl.h"
diff --git a/isis/src/control/apps/cnetcombinept/main.cpp b/isis/src/control/apps/cnetcombinept/main.cpp
index 85926a6119b224a0563b9758aef9e01eb190a73e..ff9da6a7c1dad26c5d547ebdc41584fab8deb881 100644
--- a/isis/src/control/apps/cnetcombinept/main.cpp
+++ b/isis/src/control/apps/cnetcombinept/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "cnetcombinept.h"
diff --git a/isis/src/control/apps/cnetdiff/main.cpp b/isis/src/control/apps/cnetdiff/main.cpp
index dfb48196f12689cbeac14fa6f1c39cd1214da285..c3ed771e648c8b42633c8c2aebc8913b72c786ed 100644
--- a/isis/src/control/apps/cnetdiff/main.cpp
+++ b/isis/src/control/apps/cnetdiff/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cmath>
@@ -319,4 +327,3 @@ void CompareKeywords(const PvlKeyword &pvl1, const PvlKeyword &pvl2) {
     }
   }
 }
-
diff --git a/isis/src/control/apps/cnetedit/main.cpp b/isis/src/control/apps/cnetedit/main.cpp
index 421e60db7e6584cb6766a9272304486b782c15ac..2d09cb4cde165fec8b976880cf8936e5cf514e37 100644
--- a/isis/src/control/apps/cnetedit/main.cpp
+++ b/isis/src/control/apps/cnetedit/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #define GUIHELPERS
 
 #include "Isis.h"
diff --git a/isis/src/control/apps/cnetextract/cnetextract.cpp b/isis/src/control/apps/cnetextract/cnetextract.cpp
index 249481a133d40e86c022a636a874df4ccde4b8d7..7e8969adc77349276dde57d2debe82a4ae04e8af 100644
--- a/isis/src/control/apps/cnetextract/cnetextract.cpp
+++ b/isis/src/control/apps/cnetextract/cnetextract.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "cnetextract.h"
 
 using namespace std;
diff --git a/isis/src/control/apps/cnetextract/cnetextract.h b/isis/src/control/apps/cnetextract/cnetextract.h
index 3007023a1471207c242c41983d8c111792bf7550..863941fbe8ddb7a8a549411dfc49f8e6adae5e8c 100644
--- a/isis/src/control/apps/cnetextract/cnetextract.h
+++ b/isis/src/control/apps/cnetextract/cnetextract.h
@@ -1,6 +1,14 @@
 #ifndef cnetextract_h
 #define cnetextract_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <set>
 #include <sstream>
 
diff --git a/isis/src/control/apps/cnetextract/main.cpp b/isis/src/control/apps/cnetextract/main.cpp
index 1c1eb0bd0eb0699fb9f3b71f2f64be9a0304f2c8..88261f17ef377843804e984b072a64a3a765813e 100644
--- a/isis/src/control/apps/cnetextract/main.cpp
+++ b/isis/src/control/apps/cnetextract/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "cnetextract.h"
diff --git a/isis/src/control/apps/cnethist/main.cpp b/isis/src/control/apps/cnethist/main.cpp
index d74456281695ab34d0a4ed1dc7d19f193eb8bfdb..f01e24cc59c9c0b57e694ce6bbf2239ba30dce5d 100644
--- a/isis/src/control/apps/cnethist/main.cpp
+++ b/isis/src/control/apps/cnethist/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QString>
diff --git a/isis/src/control/apps/cnetmerge/main.cpp b/isis/src/control/apps/cnetmerge/main.cpp
index aa767110c2e60a6a4cc97cd046e6430636ed289d..5679d4cced3eedc9592e322e23b8c26973da068b 100644
--- a/isis/src/control/apps/cnetmerge/main.cpp
+++ b/isis/src/control/apps/cnetmerge/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <algorithm>
@@ -20,7 +28,7 @@ using namespace Isis;
 
 ControlNet * mergeNetworks(FileList &filelist, PvlObject &conflictLog,
     QString networkId, QString description);
-void mergeNetwork(ControlNet &baseNet, ControlNet &newNet, 
+void mergeNetwork(ControlNet &baseNet, ControlNet &newNet,
     PvlObject &cnetLog, Progress progress);
 
 ControlPoint * mergePoint(
@@ -243,7 +251,7 @@ ControlNet * mergeNetworks(FileList &filelist, PvlObject &conflictLog,
     PvlObject cnetLog = createNetworkLog(newNet);
 
     // Merge the network, add the resulting conflicts to the log
-    progress.SetText("Merging file " + QString::number(cnetIndex+1) 
+    progress.SetText("Merging file " + QString::number(cnetIndex+1)
                                      + " of " + QString::number(filelist.size()));
     mergeNetwork(*baseNet, newNet, cnetLog, progress);
     addLog(conflictLog, cnetLog);
@@ -531,4 +539,3 @@ void addLog(PvlObject &cnetLog, PvlObject &pointLog, PvlGroup &measureLog) {
   if (pointLog.keywords() > 1 || pointLog.groups() > 0)
     cnetLog.addObject(pointLog);
 }
-
diff --git a/isis/src/control/apps/cnetnewradii/main.cpp b/isis/src/control/apps/cnetnewradii/main.cpp
index d704146ff8d5286e54dcdc8f057907efee225e66..cc6f8117c2c190fd972b01ea82a3374cc91f7a6d 100644
--- a/isis/src/control/apps/cnetnewradii/main.cpp
+++ b/isis/src/control/apps/cnetnewradii/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <iomanip>
diff --git a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.cpp b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.cpp
index 18fa665223f8854b55ae366bb67f5a4239c5fe9a..a3000198002f7c8db9000f168aa337c9f10a8aaf 100644
--- a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.cpp
+++ b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "cnetpvl2bin.h"
 
 using namespace std;
diff --git a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.h b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.h
index b4d074f041c40c439b2188e500a87d78399c51d9..7073c8b1557da0cdc18a1eab3afb0ee99c05cd4c 100644
--- a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.h
+++ b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.h
@@ -1,6 +1,14 @@
 #ifndef cnetpvl2bin_h
 #define cnetpvl2bin_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 #include "ControlNet.h"
 #include "Progress.h"
diff --git a/isis/src/control/apps/cnetpvl2bin/main.cpp b/isis/src/control/apps/cnetpvl2bin/main.cpp
index 3da4db18d8a84f366378792c32a787f54e3a79ce..824177ef90f7b00013eba03b27f0db6ca75fcac7 100644
--- a/isis/src/control/apps/cnetpvl2bin/main.cpp
+++ b/isis/src/control/apps/cnetpvl2bin/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "cnetpvl2bin.h"
 #include "Application.h"
diff --git a/isis/src/control/apps/cnetref/CnetRefByEmission.cpp b/isis/src/control/apps/cnetref/CnetRefByEmission.cpp
index 6c790c6a69badfc2956635cf9c429e2fccd497fc..397ff8edda119563fa0794c59ee32d86394e83f9 100644
--- a/isis/src/control/apps/cnetref/CnetRefByEmission.cpp
+++ b/isis/src/control/apps/cnetref/CnetRefByEmission.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Application.h"
 #include "CnetRefByEmission.h"
 #include "ControlNet.h"
@@ -50,7 +58,7 @@ namespace Isis {
     mStatus.SetText("Choosing Reference by Emission...");
     mStatus.SetMaximumSteps(pNewNet.GetNumPoints());
     mStatus.CheckStatus();
-    
+
     for (int point = 0; point < pNewNet.GetNumPoints(); ++point) {
       ControlPoint *newPnt = pNewNet.GetPoint(point);
 
@@ -69,7 +77,7 @@ namespace Isis {
         newPnt->SetDateTime(Application::DateTime());
       }
       else {
-        pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock"); 
+        pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock");
       }
 
       int iNumMeasuresLocked = newPnt->GetNumLockedMeasures();
@@ -89,12 +97,12 @@ namespace Isis {
       // Points having atleast 1 measure and Points not Ignored
       // Check for EditLock in the Measures and also verfify that
       // only a Reference Measure can be Locked else error
-      if (!newPnt->IsIgnored() && newPnt->GetType() == ControlPoint::Free && numMeasures > 0 && 
+      if (!newPnt->IsIgnored() && newPnt->GetType() == ControlPoint::Free && numMeasures > 0 &&
           (iNumMeasuresLocked == 0 || (iNumMeasuresLocked > 0 && bRefLocked))) {
         int iNumIgnore = 0;
         QString istrTemp;
         double dBestEmissionAngle = 135;
-        
+
         for (int measure = 0; measure < numMeasures; ++measure) {
           ControlMeasure *newMsr = newPnt->GetMeasure(measure);
           bool bMeasureLocked = newMsr->IsEditLocked();
@@ -209,7 +217,7 @@ namespace Isis {
           sComment += toString(++iComment);
           pvlPointObj += Isis::PvlKeyword(sComment, "Constrained Point");
         }
-        
+
         if (iNumMeasuresLocked > 0 && !bRefLocked) {
           pvlPointObj += Isis::PvlKeyword("Error", "Point has a Measure with EditLock set to true "
                                           "but the Reference is not Locked");
@@ -239,7 +247,7 @@ namespace Isis {
               origPnt.GetReferenceSN());
           pvlRefChangeGrp += Isis::PvlKeyword("PrevEmAngle",
               toString(bestEmissionAngle[iRefIndex]));
-  
+
           istrTemp = toString((int)origPnt.GetMeasure(iRefIndex)->GetSample());
           istrTemp += ",";
           istrTemp += toString((int)origPnt.GetMeasure(iRefIndex)->GetLine());
diff --git a/isis/src/control/apps/cnetref/CnetRefByEmission.h b/isis/src/control/apps/cnetref/CnetRefByEmission.h
index 2794a6b4fee90881ce65ec703e5f3843eab19115..7559d88328544e177983e7131255894f6283324c 100644
--- a/isis/src/control/apps/cnetref/CnetRefByEmission.h
+++ b/isis/src/control/apps/cnetref/CnetRefByEmission.h
@@ -1,30 +1,24 @@
 #ifndef _CnetRefByEmission_h_
 #define _CnetRefByEmission_h_
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNetValidMeasure.h"
 
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2010/06/23 22:29:14 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 namespace Isis {
   class Pvl;
@@ -80,4 +74,3 @@ namespace Isis {
   };
 };
 #endif
-
diff --git a/isis/src/control/apps/cnetref/CnetRefByIncidence.cpp b/isis/src/control/apps/cnetref/CnetRefByIncidence.cpp
index c8086129647ebf01a4e48d1ae9453a95f95209f9..b83ca6408f35115b053880afb299d54def93bac6 100644
--- a/isis/src/control/apps/cnetref/CnetRefByIncidence.cpp
+++ b/isis/src/control/apps/cnetref/CnetRefByIncidence.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Application.h"
 #include "CnetRefByIncidence.h"
 #include "ControlNet.h"
@@ -64,13 +72,13 @@ namespace Isis {
         newPnt->SetDateTime(Application::DateTime());
       }
       else {
-        pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock"); 
+        pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock");
       }
 
       int iNumMeasuresLocked = newPnt->GetNumLockedMeasures();
       bool bRefLocked = newPnt->GetRefMeasure()->IsEditLocked();
       int numMeasures = newPnt->GetNumMeasures();
-      
+
       int iRefIndex = -1;
       if (newPnt->IsReferenceExplicit())
         iRefIndex = newPnt->IndexOfRefMeasure();
@@ -219,14 +227,14 @@ namespace Isis {
             cm->SetChooserName("Application cnetref(Incidence)");
             //newPnt.UpdateMeasure(cm); // Redesign fixed this
           }
-        } 
+        }
       }
 
       if (*newPnt != origPnt) {
         iPointsModified++;
       }
 
-      if (!bError && !newPnt->IsIgnored() && newPnt->IsReferenceExplicit() && iBestIndex != iRefIndex 
+      if (!bError && !newPnt->IsIgnored() && newPnt->IsReferenceExplicit() && iBestIndex != iRefIndex
           && !bPntEditLock && !bRefLocked) {
         iRefChanged++;
         PvlGroup pvlRefChangeGrp("ReferenceChangeDetails");
diff --git a/isis/src/control/apps/cnetref/CnetRefByIncidence.h b/isis/src/control/apps/cnetref/CnetRefByIncidence.h
index 33bfd0313785be5013ec6b15096ebc1da8525e95..d043c9481b7cf72a8b6c2e63c1baae6b394ff43f 100644
--- a/isis/src/control/apps/cnetref/CnetRefByIncidence.h
+++ b/isis/src/control/apps/cnetref/CnetRefByIncidence.h
@@ -1,30 +1,16 @@
 #ifndef _CnetRefByIncidence_h_
 #define _CnetRefByIncidence_h_
 
-#include "ControlNetValidMeasure.h"
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
-/**
- * @file
- * $Revision: 1.5 $
- * $Date:
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+#include "ControlNetValidMeasure.h"
 
 namespace Isis {
   class ControlNet;
@@ -80,4 +66,3 @@ namespace Isis {
   };
 };
 #endif
-
diff --git a/isis/src/control/apps/cnetref/CnetRefByResolution.cpp b/isis/src/control/apps/cnetref/CnetRefByResolution.cpp
index cdadb2f4bea05682647e640ef0cb3a10eecb93d0..9ae3418b073b1be8c5e7d9ff917cff7c323056ce 100644
--- a/isis/src/control/apps/cnetref/CnetRefByResolution.cpp
+++ b/isis/src/control/apps/cnetref/CnetRefByResolution.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Application.h"
 #include "ControlNet.h"
 #include "ControlPoint.h"
@@ -65,7 +73,7 @@ namespace Isis {
     for (int point = 0; point < pNewNet.GetNumPoints(); ++point) {
       ControlPoint *newPnt = pNewNet.GetPoint(point);
       bool bError = false;
-      
+
       // Create a copy of original control point
       const ControlPoint origPnt(*newPnt);
 
@@ -81,13 +89,13 @@ namespace Isis {
         newPnt->SetDateTime(Application::DateTime());
       }
       else {
-        pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock"); 
+        pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock");
       }
 
       int iNumMeasuresLocked = newPnt->GetNumLockedMeasures();
       bool bRefLocked = newPnt->GetRefMeasure()->IsEditLocked();
       int numMeasures = newPnt->GetNumMeasures();
-      
+
       int iRefIndex = -1;
       if (newPnt->IsReferenceExplicit())
         iRefIndex = newPnt->IndexOfRefMeasure();
@@ -115,7 +123,7 @@ namespace Isis {
             newMsr->SetDateTime(Application::DateTime());
             newMsr->SetChooserName("Application cnetref(Resolution)");
           }
-         
+
           // Log
           PvlGroup pvlMeasureGrp("MeasureDetails");
           pvlMeasureGrp += Isis::PvlKeyword("SerialNum", sn);
@@ -126,7 +134,7 @@ namespace Isis {
 
           if (!newMsr->IsIgnored()) {
             Cube *measureCube = mCubeMgr.OpenCube(mSerialNumbers.fileName(sn));
-            
+
             MeasureValidationResults results =
               ValidStandardOptions(newMsr, measureCube, &pvlMeasureGrp);
             if (!results.isValid()) {
@@ -237,14 +245,14 @@ namespace Isis {
             cm->SetChooserName("Application cnetref(Resolution)");
             //newPnt.UpdateMeasure(cm); // Redesign fixed this
           }
-        } 
+        }
       }
 
       if (*newPnt != origPnt) {
         iPointsModified++;
       }
-      
-      if (!bError && !newPnt->IsIgnored() && newPnt->IsReferenceExplicit() && iBestIndex != iRefIndex 
+
+      if (!bError && !newPnt->IsIgnored() && newPnt->IsReferenceExplicit() && iBestIndex != iRefIndex
           && !bPntEditLock && !bRefLocked) {
         iRefChanged++;
         PvlGroup pvlRefChangeGrp("ReferenceChangeDetails");
@@ -252,7 +260,7 @@ namespace Isis {
           pvlRefChangeGrp += Isis::PvlKeyword("PrevSerialNumber",
               origPnt.GetMeasure(iRefIndex)->GetCubeSerialNumber());
           pvlRefChangeGrp += Isis::PvlKeyword("PrevResolution",   toString(mdResVector[iRefIndex]));
-  
+
           istrTemp = QString((int)origPnt.GetMeasure(iRefIndex)->GetSample());
           istrTemp += ",";
           istrTemp += QString((int)origPnt.GetMeasure(iRefIndex)->GetLine());
@@ -261,7 +269,7 @@ namespace Isis {
         else {
           pvlRefChangeGrp += Isis::PvlKeyword("PrevReference", "Not Set");
         }
-        
+
         pvlRefChangeGrp += Isis::PvlKeyword("NewSerialNumber",
             newPnt->GetMeasure(iBestIndex)->GetCubeSerialNumber());
         QString sKeyName = "NewHighestResolution";
@@ -357,11 +365,11 @@ namespace Isis {
           }
         }
         else if (meType == Mean) {
-          if ((int)mdResVector.size() == 2)  { 
+          if ((int)mdResVector.size() == 2)  {
             // Arbitrarily assign the 1st measure to be reference for a point with only 2 measures
             iBestIndex  = 0;
           }
-          else { 
+          else {
             double dDiff = fabs(dMean - mdResVector[i]);
             if (dBestResolution == -1 || dDiff <  dBestResolution) {
               dBestResolution = dDiff;
@@ -387,4 +395,3 @@ namespace Isis {
     return iBestIndex;
   }
 };
-
diff --git a/isis/src/control/apps/cnetref/CnetRefByResolution.h b/isis/src/control/apps/cnetref/CnetRefByResolution.h
index fef1089f5ae5b36020d2e51b0bd8c6337ceb641b..dbeaad695f17f19cc5f2f5ea46e63475a0e4eaae 100644
--- a/isis/src/control/apps/cnetref/CnetRefByResolution.h
+++ b/isis/src/control/apps/cnetref/CnetRefByResolution.h
@@ -1,30 +1,15 @@
 #ifndef _CnetRefByResolution_H_
 #define _CnetRefByResolution_H_
 
-#include "ControlNetValidMeasure.h"
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
 
-/**
- * @file
- * $Revision: 1.5 $
- * $Date:
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/* SPDX-License-Identifier: CC0-1.0 */
+
+#include "ControlNetValidMeasure.h"
 
 namespace Isis {
   /**
@@ -106,4 +91,3 @@ namespace Isis {
   };
 };
 #endif
-
diff --git a/isis/src/control/apps/cnetref/main.cpp b/isis/src/control/apps/cnetref/main.cpp
index 28d82adcc5b132cd394db20c747c409004c39bce..5c40ebcab1829177c08a1d3d6424ffe52b96bde6 100644
--- a/isis/src/control/apps/cnetref/main.cpp
+++ b/isis/src/control/apps/cnetref/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #define GUIHELPERS // should always be the first command
 
 #include "Isis.h"
@@ -254,4 +262,3 @@ void EditDefFile(void) {
 
   GuiEditFile::EditFile(ui, sDefFile);
 }
-
diff --git a/isis/src/control/apps/cnetsplit/main.cpp b/isis/src/control/apps/cnetsplit/main.cpp
index 196a63e9602115ba509d39a190e8bcbc239c0256..25fcb352b1913572045a4a1efa24b4d4f6e30fac 100644
--- a/isis/src/control/apps/cnetsplit/main.cpp
+++ b/isis/src/control/apps/cnetsplit/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "IsisDebug.h"
 
diff --git a/isis/src/control/apps/cnetstats/cnetstats.cpp b/isis/src/control/apps/cnetstats/cnetstats.cpp
index bf322e17d6f66202ba1900015b7c27063c661a64..cc3bfa7362753a6c4012eea54388950e0219b173 100644
--- a/isis/src/control/apps/cnetstats/cnetstats.cpp
+++ b/isis/src/control/apps/cnetstats/cnetstats.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "cnetstats.h"
@@ -31,7 +39,7 @@ namespace Isis{
   }
 
   /**
-    * Given some control network and criteria passed in through the UI, 
+    * Given some control network and criteria passed in through the UI,
     * return some stats on the control network and its images.
     *
     * @param net A control network object.
@@ -230,4 +238,3 @@ namespace Isis{
     return NULL;
   }
 }
-
diff --git a/isis/src/control/apps/cnetstats/cnetstats.h b/isis/src/control/apps/cnetstats/cnetstats.h
index f44950fe42391c27afc0a26c4c2d7872c0d73dbc..ea5e0428588a9e4103c200ca4769e6e08a3655cf 100644
--- a/isis/src/control/apps/cnetstats/cnetstats.h
+++ b/isis/src/control/apps/cnetstats/cnetstats.h
@@ -1,6 +1,14 @@
 #ifndef cnetstats_h
 #define cnetstats_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QString>
 
 #include "ControlNet.h"
diff --git a/isis/src/control/apps/cnetstats/main.cpp b/isis/src/control/apps/cnetstats/main.cpp
index fbf9b1d924bdd3576327ccd34809a573b2a58550..7b464b90fac504f54a175b9e076590f12755012e 100644
--- a/isis/src/control/apps/cnetstats/main.cpp
+++ b/isis/src/control/apps/cnetstats/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "cnetstats.h"
@@ -19,8 +27,8 @@ void IsisMain() {
     }
     throw;
   }
-  
+
   for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {
     Application::Log(*grpIt);
   }
-}
\ No newline at end of file
+}
diff --git a/isis/src/control/apps/cnettable/main.cpp b/isis/src/control/apps/cnettable/main.cpp
index 0197197049979b5a969df282db17051395960fd4..2345a128865c8793c50c436140e020a42436ff02 100644
--- a/isis/src/control/apps/cnettable/main.cpp
+++ b/isis/src/control/apps/cnettable/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <string>
@@ -190,14 +198,14 @@ void IsisMain() {
     measureInfo += QString(CheckValue(Asp.GetLatSigma().degrees())) + ",";
     measureInfo += QString(CheckValue(Asp.GetLonSigma().degrees())) + ",";
     measureInfo += QString(CheckValue(Asp.GetLocalRadiusSigma().kilometers())) + ",";
-    try { 
-      measureInfo += QString(CheckValue(Asp.GetLatSigmaDistance().kilometers())) + ","; 
+    try {
+      measureInfo += QString(CheckValue(Asp.GetLatSigmaDistance().kilometers())) + ",";
     }
     catch (IException &) {
       measureInfo += ",";
     }
-    try { 
-      measureInfo += QString(CheckValue(Asp.GetLonSigmaDistance().kilometers())) + ","; 
+    try {
+      measureInfo += QString(CheckValue(Asp.GetLonSigmaDistance().kilometers())) + ",";
     }
     catch (IException &) {
       measureInfo += ",";
@@ -216,14 +224,14 @@ void IsisMain() {
     measureInfo += QString(CheckValue(sp.GetLatSigma().degrees())) + ",";
     measureInfo += QString(CheckValue(sp.GetLonSigma().degrees())) + ",";
     measureInfo += QString(CheckValue(sp.GetLocalRadiusSigma().kilometers())) + ",";
-    try { 
-      measureInfo += QString(CheckValue(sp.GetLatSigmaDistance().kilometers())) + ","; 
+    try {
+      measureInfo += QString(CheckValue(sp.GetLatSigmaDistance().kilometers())) + ",";
     }
     catch (IException &e) {
       measureInfo += ",";
     }
-    try { 
-      measureInfo += QString(CheckValue(sp.GetLonSigmaDistance().kilometers())) + ","; 
+    try {
+      measureInfo += QString(CheckValue(sp.GetLonSigmaDistance().kilometers())) + ",";
     }
     catch (IException &e) {
       measureInfo += ",";
@@ -398,7 +406,7 @@ void Write(PvlGroup *point, const ControlMeasure &cm) {
       output += QString(CheckValue((*point)[i][0])) + ",";
       output += QString(CheckValue((*point)[i][1])) + ",";
       output += QString(CheckValue((*point)[i][2])) + ",";
-    } 
+    }
     else {
       output += QString(CheckValue((*point)[i][0])) + ",";
     }
diff --git a/isis/src/control/apps/cnetthinner/CnetManager.cpp b/isis/src/control/apps/cnetthinner/CnetManager.cpp
index 0bcfc4236daa88619c4118c1e754fbe77a57191d..78566d9e217a7d2be165311ef6f09fefa977aeba 100644
--- a/isis/src/control/apps/cnetthinner/CnetManager.cpp
+++ b/isis/src/control/apps/cnetthinner/CnetManager.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 6565 $
- * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <ostream>
 #include <cassert>
 #include <cfloat>
@@ -51,7 +38,7 @@ namespace Isis {
 
 /**
  * Empty Constructor. Disabled at runtime.
- * 
+ *
  */
   KPoint::KPoint() {
     m_point = 0;
@@ -63,12 +50,12 @@ namespace Isis {
 
 
 /**
- * Constructs a KPoint. 
- * 
+ * Constructs a KPoint.
+ *
  * @param point The control point to make a KPoint from.
  * @param index The source index.
- * @param weight The point's weight. 
- *  
+ * @param weight The point's weight.
+ *
  */
   KPoint::KPoint(ControlPoint *point, const int &index, const double &weight) {
     BOOST_ASSERT ( point != 0 );
@@ -80,9 +67,9 @@ namespace Isis {
 
 
 /**
- * Set the status of the KPoint to true for selected or 
- * false for unselected. 
- * 
+ * Set the status of the KPoint to true for selected or
+ * false for unselected.
+ *
  * @param state If true, the KPoint is set to selected.
  */
   void KPoint::select(const bool &state) {
@@ -91,30 +78,30 @@ namespace Isis {
 
 
 /**
- * Calculate the strength of a control point. A negative return value indicates 
- * an invalid result.  
- * 
- * @param point 
- * @param weight 
- * 
- * @return double 
+ * Calculate the strength of a control point. A negative return value indicates
+ * an invalid result.
+ *
+ * @param point
+ * @param weight
+ *
+ * @return double
  */
-  double KPoint::calculateStrength(const ControlPoint *point, 
+  double KPoint::calculateStrength(const ControlPoint *point,
                            const double &weight) const {
     // Gut check for validity
     if ( !point )  return (-2.0);
 
     // Don't use points which have only 1 valid measure or fewer, since
-    // we don't use refIncides in the strength calculation. 
+    // we don't use refIncides in the strength calculation.
     if ( point->GetNumValidMeasures() < 2.0 ) return (-1.0);
 
     // Got some good ones, compute strength
-    double sum(0.0); 
+    double sum(0.0);
     int count(0);
     int refIndex = point->IndexOfRefMeasure();
     for ( int i = 0 ; i < point->GetNumMeasures() ; i++) {
       if ( i != refIndex ) { // Check all but the reference measure
-        const ControlMeasure *m = point->GetMeasure(i); 
+        const ControlMeasure *m = point->GetMeasure(i);
         if ( !m->IsIgnored() && m->HasLogData(ControlMeasureLogData::GoodnessOfFit) ) {
           sum += m->GetLogData(ControlMeasureLogData::GoodnessOfFit).GetNumericalValue();
           count++;
@@ -132,15 +119,15 @@ namespace Isis {
 // CnetManager implementation
 
 /**
- * Constructs an emtpy CnetManager. 
- * 
+ * Constructs an emtpy CnetManager.
+ *
  */
   CnetManager::CnetManager() :  m_kpts() { }
 
 
 /**
  * Constructs a CnetManager using an input control network and a weight.
- * 
+ *
  * @param cnet Input control network to be managed.
  * @param weight Weights to apply to the control network.
  */
@@ -149,17 +136,17 @@ namespace Isis {
   }
 
 
-/** 
- *  
- * Default Destructor 
- *  
+/**
+ *
+ * Default Destructor
+ *
  */
   CnetManager::~CnetManager() { }
 
 
 /**
  * The number of points managed by CnetManager.
- * 
+ *
  * @return @b int The number of points in this CnetManager.
  */
    int CnetManager::size() const {
@@ -168,11 +155,11 @@ namespace Isis {
 
 
 /**
- * Loads a list of control points into the CnetManager. 
- * 
+ * Loads a list of control points into the CnetManager.
+ *
  * @param pts The QList of ControlPoints to load into the CnetManager.
- * @param weight The weight to apply to each ControlPoint in the list. 
- * 
+ * @param weight The weight to apply to each ControlPoint in the list.
+ *
  * @return @b int The number of ControlPoints loaded into the CnetManager.
  */
    int CnetManager::load(const QList<ControlPoint *> &pts, const double &weight) {
@@ -204,9 +191,9 @@ namespace Isis {
 
 
 /**
- * Get a list of control points in this CnetManager. 
- * 
- * @return @b const QList<ControlPoint*>  List of control points in CnetManager. 
+ * Get a list of control points in this CnetManager.
+ *
+ * @return @b const QList<ControlPoint*>  List of control points in CnetManager.
  */
    const QList<ControlPoint *> CnetManager::getControlPoints() const {
     QList<ControlPoint *> pts;
@@ -219,10 +206,10 @@ namespace Isis {
 
 /**
  * Return a map of the number of measures per cube.
- * 
+ *
  * @return @b QMap<QString,int> Serial number, number of measures per that serial number (cube)
  */
-  QMap<QString, int> CnetManager::getCubeMeasureCount() const { 
+  QMap<QString, int> CnetManager::getCubeMeasureCount() const {
     QMap<QString, int> k_map;
     BOOST_FOREACH ( const KPoint &p, m_kpts ) {
       QList<ControlMeasure *> measures = p.point()->getMeasures(true);
@@ -237,18 +224,18 @@ namespace Isis {
 
 
 /**
- * Returns control measures and their associated indicies for a given cube (serial number.) 
- * 
+ * Returns control measures and their associated indicies for a given cube (serial number.)
+ *
  * @param serialNo Serial number (indicates a specific cube) to get the measure indicies for.
- * 
+ *
  * @return @b CnetManager::PointSet Data structure containing the calculated index and measure.
  */
   CnetManager::PointSet CnetManager::getCubeMeasureIndices(const QString &serialNo) const {
     PointSet cubeNdx;
     BOOST_FOREACH ( const KPoint &p, m_kpts ) {
       int index = p.point()->IndexOf(serialNo, false);
-      if ( index >= 0 ) {  
-        cubeNdx.append( qMakePair(p.index(), p.point()->GetMeasure(index)) ); 
+      if ( index >= 0 ) {
+        cubeNdx.append( qMakePair(p.index(), p.point()->GetMeasure(index)) );
       }
     }
     return ( cubeNdx );
@@ -256,8 +243,8 @@ namespace Isis {
 
 
 /**
- * Will return the KPoint at an input index. 
- * 
+ * Will return the KPoint at an input index.
+ *
  * @return @b const KPoint& The KPoint at the requested index.
  */
   const KPoint &CnetManager::operator()(const int index) const {
@@ -267,12 +254,12 @@ namespace Isis {
 
 
 /**
- *  
- * Get a point at a specificed index. 
- *  
- * @param index Index of the point to get. 
- * 
- * @return @b const ControlPoint* The point at the requested index. 
+ *
+ * Get a point at a specificed index.
+ *
+ * @param index Index of the point to get.
+ *
+ * @return @b const ControlPoint* The point at the requested index.
  */
   const ControlPoint *CnetManager::point(const int &index) const {
     BOOST_ASSERT ( index < m_kpts.size() );
@@ -281,8 +268,8 @@ namespace Isis {
 
 
 /**
- * Gets the list of KPoints managed by this CubeManager. 
- * 
+ * Gets the list of KPoints managed by this CubeManager.
+ *
  * @return @b const QList<KPoint>&  List of KPoints managed by this CnetManager.
  */
   const QList<KPoint> &CnetManager::pointList() const {
@@ -291,11 +278,11 @@ namespace Isis {
 
 
 /**
- * Get a point at a specificed index. 
- * 
- * @param index Index of the point. 
- * 
- * @return @b ControlPoint* The point at the requested index. 
+ * Get a point at a specificed index.
+ *
+ * @param index Index of the point.
+ *
+ * @return @b ControlPoint* The point at the requested index.
  */
   ControlPoint *CnetManager::point(const int index) {
     BOOST_ASSERT ( index < m_kpts.size() );
diff --git a/isis/src/control/apps/cnetthinner/CnetManager.h b/isis/src/control/apps/cnetthinner/CnetManager.h
index 867166e712187d108983a8b451ca3bfc35064e0e..fbf62be0e3263ba0b0c353528121815dc6e462c8 100644
--- a/isis/src/control/apps/cnetthinner/CnetManager.h
+++ b/isis/src/control/apps/cnetthinner/CnetManager.h
@@ -1,26 +1,14 @@
 #ifndef CnetManager_h
 #define CnetManager_h
-/**
- * @file
- * $Revision: 6565 $
- * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <ostream>
 #include <cassert>
 #include <cfloat>
@@ -53,14 +41,14 @@ namespace Isis {
   class CnetManager;
 
 /**
- * Class to store control points with a weight and computed strength for CnetManager. 
- *  
- * @author 2016-09-30 Kris Becker 
- *  
- * @internal 
+ * Class to store control points with a weight and computed strength for CnetManager.
+ *
+ * @author 2016-09-30 Kris Becker
+ *
+ * @internal
  *   @history 2016-09-30 Kris Becker - Original Version
  *   @history 2016-12-28 Kristin Berry - Added documentation and tests for checkin
- * 
+ *
  */
   class KPoint {
 
@@ -72,22 +60,22 @@ namespace Isis {
 
       void select(const bool &state = true);
 
-      //definitions of inline functions 
+      //definitions of inline functions
 
      /**
       * Get the control point the KPoint was constructed from.
-      * 
-      * @return @b ControlPoint* The original control point. 
+      *
+      * @return @b ControlPoint* The original control point.
       */
       inline ControlPoint *point() const {
         BOOST_ASSERT ( m_point != 0 );
         return ( m_point );
       }
 
-      
+
      /**
       * Gets the calculated strength of this KPoint.
-      * 
+      *
       * @return @b double The calculated strength of this KPoint.
       */
       inline double strength() const {
@@ -97,7 +85,7 @@ namespace Isis {
 
      /**
       * Gets the index of this KPoint.
-      * 
+      *
       * @return @b int The index of this KPoint.
       */
       inline int index () const {
@@ -106,8 +94,8 @@ namespace Isis {
 
 
      /**
-       * Gets the original index of this KPoint. 
-       *  
+       * Gets the original index of this KPoint.
+       *
        * @return @b int The original or source index of this KPoint.
        */
       inline int sourceIndex() const {
@@ -119,7 +107,7 @@ namespace Isis {
       double        m_strength; //! The calulated strength of this KPoint.
       int           m_sourceIndex; //! The original index of this KPoint.
       int           m_index; //! The calculated index of this KPoint.
-      bool          m_selected; //! Flag to indicated whether to use this KPoint or not. 
+      bool          m_selected; //! Flag to indicated whether to use this KPoint or not.
 
       double calculateStrength(const ControlPoint *point, const double &weight) const;
 
@@ -128,10 +116,10 @@ namespace Isis {
 
 /**
  * Container class for the network and suppression data.
- *  
- * @author 2016-09-30 Kris Becker 
- *  
- * @internal 
+ *
+ * @author 2016-09-30 Kris Becker
+ *
+ * @internal
  *   @history 2016-09-30 Kris Becker - Original Version
  *   @history 2016-12-28 Kristin Berry - Added documentation and tests for checkin
  */
@@ -144,7 +132,7 @@ namespace Isis {
       CnetManager(ControlNet &cnet, const double &weight = 0.0);
       virtual ~CnetManager();
 
-      int size() const; 
+      int size() const;
       int load(const QList<ControlPoint *> &pts, const double &weight = 0.0);
 
       QMap<QString, int> getCubeMeasureCount() const;
@@ -157,21 +145,21 @@ namespace Isis {
 
     protected:
       ControlPoint *point(const int index);
-        
+
     private:
       QList<KPoint>              m_kpts; //! List of KPoints managed by this class
 
       /**
        * @brief Ascending order sort functor
-       * 
+       *
        * This is a comparison class used to sort lists of KPoint objects by strength, in
        * ascending order.
-       * 
-       * @author 2016-09-30 Kris Becker 
-       *  
-       * @internal 
+       *
+       * @author 2016-09-30 Kris Becker
+       *
+       * @internal
        *   @history 2016-09-30 Kris Becker - Original Version
-       *  
+       *
        */
       class SortStrengthDescending {
         public:
diff --git a/isis/src/control/apps/cnetthinner/CnetSuppression.cpp b/isis/src/control/apps/cnetthinner/CnetSuppression.cpp
index 6eca770e40e87bd4f3d2dc57e56b388bcb2b9dd0..8be3dcfb7abf9407af7e7bbc0db04376e5361b68 100644
--- a/isis/src/control/apps/cnetthinner/CnetSuppression.cpp
+++ b/isis/src/control/apps/cnetthinner/CnetSuppression.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 6565 $
- * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <ostream>
 #include <cfloat>
@@ -51,24 +38,24 @@
 namespace Isis {
 
 /**
- * Constructs an empty CnetSuppression object. 
- * 
+ * Constructs an empty CnetSuppression object.
+ *
  */
-  CnetSuppression::CnetSuppression() : CnetManager(), m_cnet(), m_points(), m_results(), 
-                                       m_early_term(EARLY_TERMINATION), 
+  CnetSuppression::CnetSuppression() : CnetManager(), m_cnet(), m_points(), m_results(),
+                                       m_early_term(EARLY_TERMINATION),
                                        m_area() { }
 
 /**
- * Constructs a CentSuppression object using a filename and a weight. 
- * 
- * @param cnetfile Filename of the controlnet file. 
- * @param weight Weight to apply to all points in controlnet. 
- *  
- * @throws IException::User "Control Net filename [FILENAME] is invalid." 
+ * Constructs a CentSuppression object using a filename and a weight.
+ *
+ * @param cnetfile Filename of the controlnet file.
+ * @param weight Weight to apply to all points in controlnet.
+ *
+ * @throws IException::User "Control Net filename [FILENAME] is invalid."
  */
-  CnetSuppression::CnetSuppression(const QString &cnetfile, const double &weight) : 
-                                   CnetManager( ), m_cnet(), m_points(), m_results(), 
-                                   m_early_term(EARLY_TERMINATION), 
+  CnetSuppression::CnetSuppression(const QString &cnetfile, const double &weight) :
+                                   CnetManager( ), m_cnet(), m_points(), m_results(),
+                                   m_early_term(EARLY_TERMINATION),
                                    m_area() {
 
     Progress progress;
@@ -79,29 +66,29 @@ namespace Isis {
       throw e;
     }
 
-    m_points = m_cnet->take(); 
+    m_points = m_cnet->take();
     load(m_points, weight);
   }
 
 
 /**
  * Constructs a CnetSuppression object using a CnetManager
- * 
+ *
  * @param cman CnetManager used to construct a CnetSuppression.
  */
-  CnetSuppression::CnetSuppression(const CnetManager &cman) : 
-                                   CnetManager(cman), 
-                                   m_cnet(), m_points(), 
-                                   m_results(), 
-                                   m_early_term(EARLY_TERMINATION), 
+  CnetSuppression::CnetSuppression(const CnetManager &cman) :
+                                   CnetManager(cman),
+                                   m_cnet(), m_points(),
+                                   m_results(),
+                                   m_early_term(EARLY_TERMINATION),
                                    m_area() { }
 
-/** 
- *  
- * Destructor. Cleans up dynamically allocated control points. 
- *  
+/**
+ *
+ * Destructor. Cleans up dynamically allocated control points.
+ *
  */
-   CnetSuppression::~CnetSuppression() { 
+   CnetSuppression::~CnetSuppression() {
      BOOST_FOREACH ( ControlPoint *p, m_points ) {
        delete p;
      }
@@ -110,30 +97,30 @@ namespace Isis {
 
 /**
  * Sets the early termiation flag
- * 
+ *
  * @param state Will terminate early if true
  */
-  void CnetSuppression::setEarlyTermination(const bool &state) { //TODO this is not used right now at all? 
+  void CnetSuppression::setEarlyTermination(const bool &state) { //TODO this is not used right now at all?
     m_early_term = state;
     return;
   }
 
 
 /**
- * Performs a suppression on all cubes associated with the CnetSuppression object and returns the 
- * results as a Results object. An input bitmask will be used to mask all pointsets associated with 
- * all cubes before running the suppression.  
- * 
+ * Performs a suppression on all cubes associated with the CnetSuppression object and returns the
+ * results as a Results object. An input bitmask will be used to mask all pointsets associated with
+ * all cubes before running the suppression.
+ *
  * @param minpts minimum points to keep in the result set
- * @param maxpts maximum points to keep in the result set. 
- * @param min_radius The minimum radius to use for the suppression calculation. 
- * @param tolerance A multiplicative tolerance on the number of maxpoints to return. 
- * @param bm A BitMask to apply to the input point set. 
- * 
- * @return @b CnetSuppression::Results The Results set for the suppression run. 
+ * @param maxpts maximum points to keep in the result set.
+ * @param min_radius The minimum radius to use for the suppression calculation.
+ * @param tolerance A multiplicative tolerance on the number of maxpoints to return.
+ * @param bm A BitMask to apply to the input point set.
+ *
+ * @return @b CnetSuppression::Results The Results set for the suppression run.
  */
   CnetSuppression::Results CnetSuppression::suppress(const int &minpts, const int &maxpts,
-                                                     const double &min_radius, 
+                                                     const double &min_radius,
                                                      const double &tolerance,
                                                      const CnetSuppression::BitMask &bm) {
 
@@ -167,40 +154,40 @@ namespace Isis {
       std::cout << "\n--> Serial: " << serialno.toStdString() << "\n";
 #endif
 
-      Results r = suppress(serialno, minpts, maxpts, min_radius, 
+      Results r = suppress(serialno, minpts, maxpts, min_radius,
                            tolerance, myBm);
       m_results.append(r);
 
 #if defined(DEBUG)
-      std::cout << "  Total Saved: " << r.size() << " at cell radius " 
+      std::cout << "  Total Saved: " << r.size() << " at cell radius "
                 << r.m_radius << "\n";
 #endif
 
       final = merge(r,final);
       myBm = final.m_selected;
     }
-   
+
     return (final);
   }
 
 
 /**
- * Performs a suppression on the PointSet associated with a single cube as indicated by 
- * its serial number and returns the results as a new PointSet. An input bitmask will 
- * be used to mask the input pointset before running the suppression.  
- * 
+ * Performs a suppression on the PointSet associated with a single cube as indicated by
+ * its serial number and returns the results as a new PointSet. An input bitmask will
+ * be used to mask the input pointset before running the suppression.
+ *
  * @param serialno The serial number for the image/cube to run suppression on.
- * @param minpts The minimum possible points to keep after a suppression run. 
- * @param maxpts The maximum possible points to keep after a suppression run. 
- * @param min_radius The minimum radius to use for the suppression calculation. 
- * @param tolerance A multiplicative tolerance on the number of maxpoints to return. 
- * @param bm A BitMask to apply to the input point set. 
- * 
- * @return @b CnetSuppression::Results The Result set for the suppression run. 
+ * @param minpts The minimum possible points to keep after a suppression run.
+ * @param maxpts The maximum possible points to keep after a suppression run.
+ * @param min_radius The minimum radius to use for the suppression calculation.
+ * @param tolerance A multiplicative tolerance on the number of maxpoints to return.
+ * @param bm A BitMask to apply to the input point set.
+ *
+ * @return @b CnetSuppression::Results The Result set for the suppression run.
  */
-  CnetSuppression::Results CnetSuppression::suppress(const QString &serialno, const int minpts, 
+  CnetSuppression::Results CnetSuppression::suppress(const QString &serialno, const int minpts,
                                                      const int &maxpts, const double &min_radius,
-                                                     const double &tolerance, 
+                                                     const double &tolerance,
                                                      const CnetSuppression::BitMask &bm) {
     PointSet cubeset = getCubeMeasureIndices(serialno);
 
@@ -213,22 +200,22 @@ namespace Isis {
 
 
 /**
- * Performs a suppression on the input PointSet and returns the result as a new PointSet. 
- * An input bitmask will be used to mask the input pointset before running the suppression.  
- * 
+ * Performs a suppression on the input PointSet and returns the result as a new PointSet.
+ * An input bitmask will be used to mask the input pointset before running the suppression.
+ *
  * @param points The point set to run suppression on.
- * @param minpts The minimum possible points to keep after a suppression run. 
- * @param maxpts The maximum possible points to keep after a suppression run. 
- * @param min_radius The minimum radius to use for the suppression calculation. 
- * @param tolerance A tolerance factor which scales the size of the search space for suppression. 
- * @param bm A BitMask to apply to the input point set. 
- * 
- * @return @b CnetSuppression::Results The Result set for the suppression run. 
+ * @param minpts The minimum possible points to keep after a suppression run.
+ * @param maxpts The maximum possible points to keep after a suppression run.
+ * @param min_radius The minimum radius to use for the suppression calculation.
+ * @param tolerance A tolerance factor which scales the size of the search space for suppression.
+ * @param bm A BitMask to apply to the input point set.
+ *
+ * @return @b CnetSuppression::Results The Result set for the suppression run.
  */
-  CnetSuppression::Results CnetSuppression::suppress(const CnetSuppression::PointSet &points, 
-                                                     const int &minpts, const int &maxpts, 
+  CnetSuppression::Results CnetSuppression::suppress(const CnetSuppression::PointSet &points,
+                                                     const int &minpts, const int &maxpts,
                                                      const double &min_radius,
-                                                     const double &tolerance, 
+                                                     const double &tolerance,
                                                      const CnetSuppression::BitMask &bm) {
 
     // Bounding box of control points
@@ -236,14 +223,14 @@ namespace Isis {
 
     double max_radius = qMax(d.width(), d.height());
     int num = qMax(qFloor(max_radius - min_radius), 11); //TODO not sure where the 11 came from...?
-    QVector<double> radii = linspace(min_radius, max_radius, num, 
+    QVector<double> radii = linspace(min_radius, max_radius, num,
                                      1.0/qSqrt(2.0) );
 
     QPointF botR = d.bottomRight();
 
 #if defined(DEBUG)
     QPointF topL = d.topLeft();
-    std::cout << "  Domain((x), (y)): (" << topL.x() << "," << botR.x() 
+    std::cout << "  Domain((x), (y)): (" << topL.x() << "," << botR.x()
               << "), (" << topL.y() << "," << botR.y() << ")\n";
     std::cout << "  Min.Max, count Radius: " << min_radius << ", "
               << max_radius << " ," << num << "\n";
@@ -259,7 +246,7 @@ namespace Isis {
     PointSet fixed( contains(bm, points) );
 
 #if defined(DEBUG)
-    std::cout << "  FixedPoints: " << fixed.size() << " - ToSave: " 
+    std::cout << "  FixedPoints: " << fixed.size() << " - ToSave: "
               << v_maxpts << " (scaled) - Pnttol: " << pnttol << "\n";
 #endif
 
@@ -276,7 +263,7 @@ namespace Isis {
       m_results.append(result);
       return (result);
     }
-    
+
     // Binary loop around cell radius list
     int bmin = 0;
     int bmax = radii.size() - 1;
@@ -334,8 +321,8 @@ namespace Isis {
 
 #if defined(DEBUG)
           int ncov = cover(grid, x_center, y_center, cell_size);
-          std::cout << "  TotalCovered: " << ncov << "(" << nCovered(grid) 
-                    << ") of " << (n_x_cells*n_y_cells) << "\n"; 
+          std::cout << "  TotalCovered: " << ncov << "(" << nCovered(grid)
+                    << ") of " << (n_x_cells*n_y_cells) << "\n";
 #endif
 
         }
@@ -345,7 +332,7 @@ namespace Isis {
 //      std::cout << "  PointsFound: " << result.size() << "\n";
 
       // Now determine if we have enough points to call it good
-      if (  (result.size() >= (v_maxpts - pnttol) ) &&  
+      if (  (result.size() >= (v_maxpts - pnttol) ) &&
             (result.size() <= (v_maxpts + pnttol) ) ) {
         bmax = bmin;  // This will terminate the binary search
       }
@@ -367,11 +354,11 @@ namespace Isis {
 
 
 /**
- * Write out a Results object to an output control network. 
- * 
+ * Write out a Results object to an output control network.
+ *
  * @param onetfile Filename for output control network
  * @param result Object containin the results of a suppression calculation
- * @param saveall If true, copies all points to the output control net, even if ignored. 
+ * @param saveall If true, copies all points to the output control net, even if ignored.
  * @param netid Control networkd id
  */
   void CnetSuppression::write(const QString &onetfile, const Results &result,
@@ -386,12 +373,12 @@ namespace Isis {
       onet->SetCreatedDate(Application::DateTime());
     }
     else {
-      onet.reset( new ControlNet(*m_cnet) ); 
+      onet.reset( new ControlNet(*m_cnet) );
     }
 
     if ( !netid.isEmpty() ) { onet->SetNetworkId(netid); }
 
-    // Set states from result set and add points if 
+    // Set states from result set and add points if
     for ( int i = 0 ; i < size() ; i++ ) {
       ControlPoint *p = point(i);
       p->SetIgnored( !result.m_selected[i] );
@@ -404,7 +391,7 @@ namespace Isis {
         onet->AddPoint( m_points[i] );
       }
     }
-    
+
     // Write the points
     onet->Write(onetfile);
     (void) onet->take();  // Not necessary to retain these points
@@ -414,7 +401,7 @@ namespace Isis {
 
 /**
  * Gets the control net associated with the CnetSuppresssion.
- * 
+ *
  * @return @b const ControlNet* The control net for this CnetSuppression
  */
   const ControlNet *CnetSuppression::net() const {
@@ -424,9 +411,9 @@ namespace Isis {
 
 /**
  * Gets the index of an input IndexPoint
- * 
+ *
  * @param p An IndexPoint to get the index of.
- * 
+ *
  * @return @b int The index of the input index point.
  */
   int CnetSuppression::index(const CnetSuppression::IndexPoint &p) const {
@@ -436,9 +423,9 @@ namespace Isis {
 
 /**
  * Gets the control measure from the input IndexPoint.
- * 
+ *
  * @param p The IndexPoint to get the control measure from
- * 
+ *
  * @return @b ControlMeasure* The control measure of the input IndexPoint
  */
    ControlMeasure *CnetSuppression::measure(const CnetSuppression::IndexPoint &p) const {
@@ -447,16 +434,16 @@ namespace Isis {
 
 
 /**
- * Create a BitMask of a specified size for an input PointSet. 
- * 
+ * Create a BitMask of a specified size for an input PointSet.
+ *
  * @param nbits The size of a BitMask to create.
  * @param p The PointSet used to create a BitMask.
- * 
- * @return @b CnetSuppression::BitMask A bit mask with entires set to true if their index is in the 
- *                             input PointSet.  
+ *
+ * @return @b CnetSuppression::BitMask A bit mask with entires set to true if their index is in the
+ *                             input PointSet.
  */
-  CnetSuppression::BitMask CnetSuppression::maskPoints(int nbits, 
-                                                        const CnetSuppression::PointSet &p) 
+  CnetSuppression::BitMask CnetSuppression::maskPoints(int nbits,
+                                                        const CnetSuppression::PointSet &p)
                                                         const {
     BOOST_ASSERT (nbits > 0);
     BitMask bm(nbits, false);
@@ -469,14 +456,14 @@ namespace Isis {
 
 
 /**
- * Use an input BitMask to mask the input PointSet, and return the results. 
- * 
+ * Use an input BitMask to mask the input PointSet, and return the results.
+ *
  * @param bm BitMask contining true for indices to keep and false for indicies to get rid of.
  * @param pset The PointSet to apply the BitMask to.
- * 
- * @return @b CnetSuppression::PointSet A PointSet containing only the points not masked out. 
+ *
+ * @return @b CnetSuppression::PointSet A PointSet containing only the points not masked out.
  */
-  CnetSuppression::PointSet CnetSuppression::contains(const CnetSuppression::BitMask &bm, 
+  CnetSuppression::PointSet CnetSuppression::contains(const CnetSuppression::BitMask &bm,
                                                       const CnetSuppression::PointSet &pset) const {
     PointSet result;
     if ( bm.dim1() == 0 ) { return (result); }
@@ -493,16 +480,16 @@ namespace Isis {
 
 
 /**
- * Calculates the (x,y) coordinates for an IndexPoint inside of a cell 
- * of input size.  
- * 
+ * Calculates the (x,y) coordinates for an IndexPoint inside of a cell
+ * of input size.
+ *
  * @param p The index point to calculate the x_center and y_center of.
  * @param cell_size Size of the cell.
  * @param x_center The x-coordinate of the center of the cell (Result).
  * @param y_center The y-coordinate of the center of the cell (Result).
  */
-  void CnetSuppression::cellIndex(const CnetSuppression::IndexPoint &p, 
-                                  const double &cell_size, 
+  void CnetSuppression::cellIndex(const CnetSuppression::IndexPoint &p,
+                                  const double &cell_size,
                                   int &x_center, int &y_center) const {
     x_center = int((measure(p)->GetSample()) / cell_size);
     y_center = int((measure(p)->GetLine())   / cell_size);
@@ -511,12 +498,12 @@ namespace Isis {
 
 
 /**
- * Determine the number of (x,y) positions in the input grid which are set to true. 
- *  
- * @param grid The grid to calculate the number of covered points from. 
- * 
- * @return @b int The number of convered points; the number of (x,y) positions for which the bitmask 
- *                is set to true. 
+ * Determine the number of (x,y) positions in the input grid which are set to true.
+ *
+ * @param grid The grid to calculate the number of covered points from.
+ *
+ * @return @b int The number of convered points; the number of (x,y) positions for which the bitmask
+ *                is set to true.
  */
   int CnetSuppression::nCovered(const CnetSuppression::GridMask &grid) const {
     int ncov(0);
@@ -530,18 +517,18 @@ namespace Isis {
 
 
 /**
- * Update a grid to contain true values where it is covered by cells as defined by the input 
- * PointSet.  
- *  
- * @param grid The grid to update by setting to true grid entries which are contained within cells 
- *             definted by the input PointSet. 
- * @param points The input PointSet to use to update the grid. 
+ * Update a grid to contain true values where it is covered by cells as defined by the input
+ * PointSet.
+ *
+ * @param grid The grid to update by setting to true grid entries which are contained within cells
+ *             definted by the input PointSet.
+ * @param points The input PointSet to use to update the grid.
  * @param cell_size The size of a cell.
- * 
- * @return @b int The number of grid entries updated. 
+ *
+ * @return @b int The number of grid entries updated.
  */
-  int CnetSuppression::cover(CnetSuppression::GridMask &grid, 
-                             const CnetSuppression::PointSet &points, 
+  int CnetSuppression::cover(CnetSuppression::GridMask &grid,
+                             const CnetSuppression::PointSet &points,
                              const double &cell_size) const {
 
     int x_center, y_center, ncov(0);
@@ -549,24 +536,24 @@ namespace Isis {
       cellIndex(p, cell_size, x_center, y_center);
       ncov = cover(grid, x_center, y_center, cell_size);
     }
-    return (ncov); //ncov should be += for _all_ covered? 
+    return (ncov); //ncov should be += for _all_ covered?
   }
 
 
 /**
- * Update a grid to contain true values where it overlaps a rectangle defined by the 
- * input paramters and return the number of values contained in this rectange.  
- *  
- * @param grid The grid to update by setting to true grid entries contained within the 
+ * Update a grid to contain true values where it overlaps a rectangle defined by the
+ * input paramters and return the number of values contained in this rectange.
+ *
+ * @param grid The grid to update by setting to true grid entries contained within the
  *             rectangle defined by the paramters passed to this function.
- * @param x_center The x-coordinate of the center of the grid. 
- * @param y_center The y-coordinate of the center of the grid. 
- * @param cell_size The size of a cell. 
- * 
- * @return @b int The number of covered cells. 
+ * @param x_center The x-coordinate of the center of the grid.
+ * @param y_center The y-coordinate of the center of the grid.
+ * @param cell_size The size of a cell.
+ *
+ * @return @b int The number of covered cells.
  */
-  int CnetSuppression::cover(CnetSuppression::GridMask &grid, 
-                             const int &x_center, const int &y_center, 
+  int CnetSuppression::cover(CnetSuppression::GridMask &grid,
+                             const int &x_center, const int &y_center,
                              const double &cell_size) const {
 
     int n_x_cells = grid.dim1();
@@ -590,14 +577,14 @@ namespace Isis {
 
 
 /**
- * Merge two PointSets together and return the result. 
- * 
- * @param s1 The first PointSet to be merged. 
- * @param s2 The second PointSet to be merged. 
- * 
+ * Merge two PointSets together and return the result.
+ *
+ * @param s1 The first PointSet to be merged.
+ * @param s2 The second PointSet to be merged.
+ *
  * @return @b CnetSuppression::PointSet The merged PointSet.
  */
-  CnetSuppression::PointSet CnetSuppression::merge(const CnetSuppression::PointSet &s1, 
+  CnetSuppression::PointSet CnetSuppression::merge(const CnetSuppression::PointSet &s1,
                                                    const CnetSuppression::PointSet &s2) const {
     BitMask bm2 = maskPoints(size(), s2);
     PointSet merged = s2;
@@ -611,14 +598,14 @@ namespace Isis {
 
 
 /**
- * Merge two CnetSuppression::Results objects together and return the result. 
- * 
- * @param r1 The first Results to be merged. 
+ * Merge two CnetSuppression::Results objects together and return the result.
+ *
+ * @param r1 The first Results to be merged.
  * @param r2 The second Results to be merged.
- * 
- * @return @b CnetSuppression::Results The merged Results. 
+ *
+ * @return @b CnetSuppression::Results The merged Results.
  */
-  CnetSuppression::Results CnetSuppression::merge(const CnetSuppression::Results &r1, 
+  CnetSuppression::Results CnetSuppression::merge(const CnetSuppression::Results &r1,
                                                   const CnetSuppression::Results &r2) const {
     if ( !r1.isValid() ) { return (r2); }
     if ( !r2.isValid() ) { return (r1); }
@@ -647,30 +634,30 @@ namespace Isis {
 
 
 /**
- * Calculates the ratio between the area contained in a square of side-length d and the area 
- * of the CnetSuppression. 
- * 
- * @param d The length of a side of a square. 
- * 
- * @return @b double The fraction: area of a square of size d / the area of the CnetSuppression. 
+ * Calculates the ratio between the area contained in a square of side-length d and the area
+ * of the CnetSuppression.
+ *
+ * @param d The length of a side of a square.
+ *
+ * @return @b double The fraction: area of a square of size d / the area of the CnetSuppression.
  */
   double CnetSuppression::getScale(const QSizeF &d) const {
     if ( m_area.isEmpty() ) {  m_area = d;  }
-    double area = d.width() * d.height(); 
+    double area = d.width() * d.height();
     double pcnt = area / (m_area.width() * m_area.height());
     return ( pcnt );
   }
 
 
 /**
- * Computes and returns the bitwise 'or' of the two input bitmasks.  
- *  
+ * Computes and returns the bitwise 'or' of the two input bitmasks.
+ *
  * @param b1 First input BitMask
  * @param b2 Second input BitMask
- * 
+ *
  * @return @b CnetSuppression::BitMask A BitMask which is the bitwise result of 'b1 or b2'
  */
-   CnetSuppression::BitMask CnetSuppression::orMasks(const CnetSuppression::BitMask &b1, 
+   CnetSuppression::BitMask CnetSuppression::orMasks(const CnetSuppression::BitMask &b1,
                                                      const CnetSuppression::BitMask &b2) const {
     BOOST_ASSERT ( b1.dim1() == b2.dim1() );
     BitMask omask(b1.dim1());
@@ -682,22 +669,22 @@ namespace Isis {
 
 
 /**
- * Creates and returns a vector which contains num entries, starting at dmin and ending at dmax. 
- * The entires in-between span the space between dmin and dmax with equal steps each time. The 
- * entire vector is multiplied by an input scale factor.  
- * 
+ * Creates and returns a vector which contains num entries, starting at dmin and ending at dmax.
+ * The entires in-between span the space between dmin and dmax with equal steps each time. The
+ * entire vector is multiplied by an input scale factor.
+ *
  * @param dmin The minimum value of the vector.
- * @param dmax The maximum value of the vector. 
- * @param num The number of entries that should be in the returned vector. 
+ * @param dmax The maximum value of the vector.
+ * @param num The number of entries that should be in the returned vector.
  * @param scale Multiplicative scale factor to multiply the entire vector by.
- * 
- * @return @b QVector<double> A vector of size num with entries starting at dmin and ending 
+ *
+ * @return @b QVector<double> A vector of size num with entries starting at dmin and ending
  *            at dmax with values of equal increment spanning the space between them and
- *            with all entries multiplied by scale.  
+ *            with all entries multiplied by scale.
  */
-  QVector<double> CnetSuppression::linspace(const double dmin, 
-                                            const double dmax, 
-                                            const int num, 
+  QVector<double> CnetSuppression::linspace(const double dmin,
+                                            const double dmax,
+                                            const int num,
                                             const double &scale) const {
     double inc = (dmax - dmin) / (double) (num - 1);
     QVector<double> ndarray(num);
@@ -710,4 +697,3 @@ namespace Isis {
 
 
 } // namespace Isis
-
diff --git a/isis/src/control/apps/cnetthinner/CnetSuppression.h b/isis/src/control/apps/cnetthinner/CnetSuppression.h
index 3acfdfabc6ab6ec97dd76d974391f7b3e3d8e17b..1ae0abd91d407fd76d27436b3cfbbe7c9fd67498 100644
--- a/isis/src/control/apps/cnetthinner/CnetSuppression.h
+++ b/isis/src/control/apps/cnetthinner/CnetSuppression.h
@@ -1,26 +1,14 @@
 #ifndef CnetSuppression_h
 #define CnetSuppression_h
-/**
- * @file
- * $Revision: 6565 $
- * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <ostream>
 #include <cfloat>
 #include <cmath>
@@ -45,15 +33,15 @@ namespace Isis {
 
 /**
  * Container class for CnetManager
- *  
- * @author 2016-09-30 Kris Becker 
- *  
- * @internal 
+ *
+ * @author 2016-09-30 Kris Becker
+ *
+ * @internal
  *   @history 2016-09-30 Kris Becker - Original Version
  *   @history 2016-12-28 Kristin Berry - Added documentation and tests for checkin
  *   @history 2017-08-09 Summer Stapleton - Added a try-catch in constructor to throw proper
  *                         error for invalid control net. Fixes #5068.
- * 
+ *
  */
   class CnetSuppression : public CnetManager {
     public:
@@ -63,20 +51,20 @@ namespace Isis {
       typedef TNT::Array2D<bool>       GridMask;
       typedef TNT::Array1D<bool>       BitMask;
 
-      /** 
+      /**
        * Results of a particular suppression
-       *  
-       * @author 2016-09-30 Kris Becker 
-       *  
-       * @internal 
+       *
+       * @author 2016-09-30 Kris Becker
+       *
+       * @internal
        *   @history 2016-09-30 Kris Becker - Original Version
-       *  
+       *
        */
       class Results {
         public:
-          Results() : m_candidates(), m_selected(), m_points(), 
-                      m_domain(), m_radius(0) { } 
-          Results(const int n, const QRectF domain, const double &radius) : 
+          Results() : m_candidates(), m_selected(), m_points(),
+                      m_domain(), m_radius(0) { }
+          Results(const int n, const QRectF domain, const double &radius) :
                   m_candidates(n, false), m_selected(n, false),
                   m_points(), m_domain(domain),m_radius(radius) {
           }
@@ -84,7 +72,7 @@ namespace Isis {
 
         /**
          * True if the Results are valid.
-         * 
+         *
          * @return @b bool True if results are valid.
          */
           inline bool isValid() const {
@@ -93,9 +81,9 @@ namespace Isis {
 
 
        /**
-         * The number of points in the Result. 
-         * 
-         * @return @b int Number of points in the Result. 
+         * The number of points in the Result.
+         *
+         * @return @b int Number of points in the Result.
          */
           inline int size() const {
             return ( m_points.size() );
@@ -103,9 +91,9 @@ namespace Isis {
 
 
         /**
-         * Add a PointSet to the Results. 
-         * 
-         * @param points The points to add to the Result set. 
+         * Add a PointSet to the Results.
+         *
+         * @param points The points to add to the Result set.
          */
           inline void add(const PointSet &points) {
             BOOST_FOREACH (const IndexPoint &p, points) { add(p); }
@@ -114,9 +102,9 @@ namespace Isis {
 
 
         /**
-         * Add a single point to the Result. 
-         * 
-         * @param point The point to add to the Result. 
+         * Add a single point to the Result.
+         *
+         * @param point The point to add to the Result.
          */
           inline void add(const IndexPoint &point) {
             m_points.append(point);
@@ -126,11 +114,11 @@ namespace Isis {
             return;
           }
 
-          BitMask    m_candidates; //! 
-          BitMask    m_selected; //! 
-          PointSet   m_points; //! 
+          BitMask    m_candidates; //!
+          BitMask    m_selected; //!
+          PointSet   m_points; //!
           QRectF     m_domain; //!
-          double     m_radius; //! 
+          double     m_radius; //!
       };
 
       CnetSuppression();
@@ -142,21 +130,21 @@ namespace Isis {
       void setEarlyTermination(const bool &state = true);
 
       Results suppress(const int &minpts, const int &maxpts,
-                       const double &min_radius = 1.5, 
+                       const double &min_radius = 1.5,
                        const double &tolerance = 0.1,
                        const BitMask &bm = BitMask());
 
-      Results suppress(const QString &serialno, const int minpts, 
+      Results suppress(const QString &serialno, const int minpts,
                        const int &maxpts, const double &min_radius,
-                       const double &tolerance, 
+                       const double &tolerance,
                        const BitMask &bm = BitMask());
 
-      Results suppress(const PointSet &points, const int &minpts, 
+      Results suppress(const PointSet &points, const int &minpts,
                        const int &maxpts, const double &min_radius,
-                       const double &tolerance, 
+                       const double &tolerance,
                        const BitMask &bm = BitMask());
 
-   
+
       void write(const QString &onetfile, const Results &result,
                  const bool saveall = false, const QString &netid = "");
 
@@ -180,9 +168,9 @@ namespace Isis {
       void cellIndex(const IndexPoint &p, const double &cell_size,
                      int &x_center, int &y_center) const;
       int nCovered(const GridMask &grid) const;
-      int cover(GridMask &grid, const PointSet &points, 
+      int cover(GridMask &grid, const PointSet &points,
                 const double &cell_size) const;
-      int cover(GridMask &grid, const int &x_center, const int &y_center, 
+      int cover(GridMask &grid, const int &x_center, const int &y_center,
                 const double &cell_size) const;
 
       PointSet merge(const PointSet &s1, const PointSet &s2) const;
@@ -191,21 +179,21 @@ namespace Isis {
       QRectF domain(const PointSet &pts) const;
       double getScale(const QSizeF &d) const;
       BitMask orMasks(const BitMask &b1, const BitMask &b2) const;
-      QVector<double> linspace(const double dmin, const double dmax, 
+      QVector<double> linspace(const double dmin, const double dmax,
                                const int num, const double &scale = 1.0) const;
 
 
       /**
        * @brief Descending order sort functor
-       * 
-       * This is a comparison class used to sort lists of objects, 
+       *
+       * This is a comparison class used to sort lists of objects,
        * where the QPair.second datum is a number in descending order.
-       * 
-       * @author 2016-09-30 Kris Becker 
-       *  
-       * @internal 
+       *
+       * @author 2016-09-30 Kris Becker
+       *
+       * @internal
        *   @history 2016-09-30 Kris Becker - Original Version
-       *  
+       *
        */
       class SortSerialsByPntSize {
         public:
diff --git a/isis/src/control/apps/cnetthinner/main.cpp b/isis/src/control/apps/cnetthinner/main.cpp
index 82c07ed5feceb4a4e2c3c32211a72dbf8109645e..0df6e6e2fdf1c622c85d429616d8886db79a1f58 100644
--- a/isis/src/control/apps/cnetthinner/main.cpp
+++ b/isis/src/control/apps/cnetthinner/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QtGlobal>
@@ -12,12 +20,12 @@ using namespace std;
 using namespace Isis;
 
 void IsisMain() {
- 
+
   // We will be processing by line
   ProcessByLine p;
   UserInterface &ui = Application::GetUserInterface();
 
-  QString cnetfrom  = ui.GetAsString("CNET"); 
+  QString cnetfrom  = ui.GetAsString("CNET");
   double  weight     = ui.GetDouble("WEIGHT");
   double  tolerance  = ui.GetDouble("TOLERANCE");
   int     maxpoints  = ui.GetDouble("MAXPOINTS");
@@ -25,7 +33,7 @@ void IsisMain() {
   QString suppressed = ui.GetString("SUPPRESSED").toLower();
 
   if (tolerance < 0.0 || tolerance > 1.0) {
-      QString msg = "TOLERANCE must be between 0.0 and 1.0"; 
+      QString msg = "TOLERANCE must be between 0.0 and 1.0";
       throw IException(IException::User, msg, _FILEINFO_);
   }
 
@@ -47,7 +55,7 @@ void IsisMain() {
     if ( ui.WasEntered("NETWORKID") ) {
       netid = ui.GetString("NETWORKID");
     }
-    suppressor->write(ui.GetAsString("ONET"), result, saveall, netid); 
+    suppressor->write(ui.GetAsString("ONET"), result, saveall, netid);
   }
 
   // Report results
@@ -61,4 +69,3 @@ void IsisMain() {
   p.EndProcess();
 
 }
-
diff --git a/isis/src/control/apps/cnetwinnow/cnetwinnow.cpp b/isis/src/control/apps/cnetwinnow/cnetwinnow.cpp
index 4ec30a67c4059676a8aa5192c04db010a10cfda7..96551d352f97b685fcd96b4bc702b0e3430cd5e6 100644
--- a/isis/src/control/apps/cnetwinnow/cnetwinnow.cpp
+++ b/isis/src/control/apps/cnetwinnow/cnetwinnow.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "cnetwinnow.h"
 
 #include <geos_c.h>
diff --git a/isis/src/control/apps/cnetwinnow/cnetwinnow.h b/isis/src/control/apps/cnetwinnow/cnetwinnow.h
index 6c5c18320d22ffbf1ce4bc5c3c2763f5e6ab5382..f2e8ae337412c094c423145690bfe9355d2bf7de 100644
--- a/isis/src/control/apps/cnetwinnow/cnetwinnow.h
+++ b/isis/src/control/apps/cnetwinnow/cnetwinnow.h
@@ -1,6 +1,14 @@
 #ifndef cnetwinnow_h
 #define cnetwinnow_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNet.h"
 #include "ControlMeasure.h"
 #include "UserInterface.h"
diff --git a/isis/src/control/apps/cnetwinnow/main.cpp b/isis/src/control/apps/cnetwinnow/main.cpp
index d8fce75b03219e11ec754d8987cc54994fdf2aff..801e67e4834e5827cad525dcb93f294741acf4b1 100644
--- a/isis/src/control/apps/cnetwinnow/main.cpp
+++ b/isis/src/control/apps/cnetwinnow/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "cnetwinnow.h"
diff --git a/isis/src/control/apps/coreg/main.cpp b/isis/src/control/apps/coreg/main.cpp
index 264812f7927d704eaa734d5087353d2c77586f23..a6396993bf1bb77678554956ef8535f9f1738b62 100644
--- a/isis/src/control/apps/coreg/main.cpp
+++ b/isis/src/control/apps/coreg/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #define GUIHELPERS
 
 #include "Isis.h"
diff --git a/isis/src/control/apps/deltack/main.cpp b/isis/src/control/apps/deltack/main.cpp
index 1b78cb116a420d3a6c33ef4bdae30643b12aafac..97f4b5b782a70e951a50347391d9b3c7b10c3e28 100644
--- a/isis/src/control/apps/deltack/main.cpp
+++ b/isis/src/control/apps/deltack/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cmath>
@@ -43,7 +51,7 @@ void printMatrix(const SpiceDouble m[3][3]);
 
 
 void IsisMain() {
-  Progress progress;  
+  Progress progress;
   UserInterface &ui = Application::GetUserInterface();
   QString filename = ui.GetFileName("FROM");
   //ControlNet m_cnet(ui.GetFileName("NET"),&progress);
@@ -58,7 +66,7 @@ void IsisMain() {
     // Create a serial number list
     SerialNumberList serialNumberList;
     serialNumberList.add(filename);
-    
+
     // Get the coordinate for updating the camera pointing
     // We will want to make the camera pointing match the lat/lon at this
     // line sample
@@ -90,13 +98,13 @@ void IsisMain() {
     results += PvlKeyword("Method", method);
     if ( "direct" == method ) {
       Camera *v_cam = c.camera();
-      
+
       // Map the latitude/longitude to a line/sample of the desired update
       // cout << "Input Lat, Lon = " << lat1.degrees() << "," << lon1.degrees() << "\n";
       results += PvlKeyword("Lat1", toString(lat1.degrees()), "degrees");
       results += PvlKeyword("Lon1", toString(lon1.degrees()), "degrees");
       if ( !v_cam->SetUniversalGround(lat1.degrees(), lon1.degrees()) ) {
-        QString mess = "Geometry coordinate does not map into image at location (" + 
+        QString mess = "Geometry coordinate does not map into image at location (" +
                        QString::number(lat1.degrees()) + "," + QString::number(lon1.degrees()) + ")";
         throw IException(IException::User, mess, _FILEINFO_);
       }
@@ -122,7 +130,7 @@ void IsisMain() {
         }
 
         // At this point, we only need the look direction which is always
-        // set at this stage - just don't have surface geometry. 
+        // set at this stage - just don't have surface geometry.
         PvlKeyword offbody = PvlKeyword("Samp1Line1Lat");
         offbody.addComment("Does not intersect surface - can still adjust pointing!");
         results += offbody;
@@ -172,7 +180,7 @@ void IsisMain() {
       }
       // We have three fields which indicates euler angle polynimials. We must
       // handle this differently.
-      else {  
+      else {
 
         // We only know how to handle a cache with just four records. Anything
         // else and we have to abort...
@@ -190,7 +198,7 @@ void IsisMain() {
         v_cam->instrumentRotation()->SetPolynomial();
         o_cmat = v_cam->instrumentRotation()->Cache("InstrumentPointing");
       }
-      
+
       // Write out a description in the spice table
       results += PvlKeyword("RecordsUpdated", toString(o_cmat.Records()));
       QString deltackComment = "deltackDirectAdjusted = " + Isis::iTime::CurrentLocalTime();
@@ -200,7 +208,7 @@ void IsisMain() {
       c.write(o_cmat);
     }
     else { // ( "bundle" == method )
-      
+
       Distance rad1;
       if (ui.WasEntered("RAD1")) {
         rad1 = Distance(ui.GetDouble("RAD1"), Distance::Meters);
@@ -208,7 +216,7 @@ void IsisMain() {
       else {
         rad1 = GetRadius(ui.GetFileName("FROM"), lat1, lon1);
       }
-      
+
       // In order to use the bundle adjustment class we will need a control
       // network
       ControlMeasure * m = new ControlMeasure;
@@ -217,13 +225,13 @@ void IsisMain() {
 
       //   m->SetType(ControlMeasure::Manual);
       m->SetType(ControlMeasure::RegisteredPixel);
-      
+
       ControlPoint * p = new ControlPoint;
       p->SetAprioriSurfacePoint(SurfacePoint(lat1, lon1, rad1));
       p->SetId("Point1");
       p->SetType(ControlPoint::Fixed);
       p->Add(m);
-      
+
       ControlNet cnet;
       //  cnet.SetType(ControlNet::ImageToGround);
       cnet.AddPoint(p);
@@ -244,21 +252,21 @@ void IsisMain() {
         else {
           rad2 = GetRadius(ui.GetFileName("FROM"), lat2, lon2);
         }
-      
+
         ControlMeasure * m = new ControlMeasure;
         m->SetCubeSerialNumber(serialNumberList.serialNumber(0));
         m->SetCoordinate(samp2, line2);
         m->SetType(ControlMeasure::Manual);
-      
+
         ControlPoint * p = new ControlPoint;
         p->SetAprioriSurfacePoint(SurfacePoint(lat2, lon2, rad2));
         p->SetId("Point2");
         p->SetType(ControlPoint::Fixed);
         p->Add(m);
-      
+
         cnet.AddPoint(p);
       }
-      
+
       // Bundle adjust to solve for new pointing
       BundleSettingsQsp settings = bundleSettings();
       BundleAdjust *bundleAdjust = new BundleAdjust(settings, cnet, serialNumberList);
@@ -285,13 +293,13 @@ void IsisMain() {
       //cmatrix.Label().findObject("Table",Pvl::Traverse).addKeyword(description);
 
       c.write(cmatrix);
-      
+
       delete bundleAdjust;
       delete bundleSolution;
     }
 
     // Now do final clean up as the update was successful if we reach here...
-    
+
     // Check for existing polygon, if exists delete it
     if (c.label()->hasObject("Polygon")) {
       c.label()->deleteObject("Polygon");
@@ -354,7 +362,7 @@ BundleSettingsQsp bundleSettings() {
   //     longitude sigma        = 1000.0
   //     radius sigma           = Null since we are not solving for radius
   //     outlier rejection      = false
-  settings->setSolveOptions(false, false, false, false, SurfacePoint::Latitudinal, 
+  settings->setSolveOptions(false, false, false, false, SurfacePoint::Latitudinal,
                             SurfacePoint::Latitudinal, 1000.0, 1000.0, Isis::Null);
   settings->setOutlierRejection(false);
 
@@ -400,26 +408,26 @@ BundleSettingsQsp bundleSettings() {
 }
 
 /**
- * @brief Compute rotation matrix of one vector into another 
- *  
- * This function computes the 3x3 rotation matrix of one vector into another 
- * using Rodriques' formula. See 
- * https://math.stackexchange.com/questions/293116/rotating-one-3d-vector-to-another. 
- *  
- * The basic equation is: 
- *  
+ * @brief Compute rotation matrix of one vector into another
+ *
+ * This function computes the 3x3 rotation matrix of one vector into another
+ * using Rodriques' formula. See
+ * https://math.stackexchange.com/questions/293116/rotating-one-3d-vector-to-another.
+ *
+ * The basic equation is:
+ *
  *     R = I + sin(theta) * A + (1 - cos(theta)) * A^2
- *  
+ *
  *  where I is the identity matrix, theta is essentially the separation angle of
  *  the two vectors and A is the skew matrix of the cross product of the two
  *  vectors.  Note that if theta ~= 0, then the identity matrix is returned.
- *  
+ *
  *  Note this implementation does not handle the case where (pi - theta) ~= 0 as
  *  it doesn't seem possible in this case (choose for x any vector orthogonal to
  *  v1).
- * 
+ *
  * @author 2017-05-22 Kris Becker
- * 
+ *
  * @param v1  Vector to rotate into v2
  * @param v2  Desired vector of rotation
  * @param rmat  Returns 3x3 rotation matrix to rotate v1 -> v2
@@ -441,16 +449,16 @@ void Vector2VectorRotation(const double v1[3], const double v2[3], double rmat[3
     ident_c ( rmat );
     return;
   }
-  
+
   // Need identity matrix
   SpiceDouble I[3][3];
   ident_c ( I );
 
   // Skew-symmetric matrix A corresponding to x
-  SpiceDouble A[3][3] = { 
+  SpiceDouble A[3][3] = {
                           {   0.0,  -x[2],  x[1] },
                           {  x[2],    0.0, -x[0] },
-                          { -x[1],   x[0],   0.0 } 
+                          { -x[1],   x[0],   0.0 }
                         };
 
   // Scale skew matrix by sin(theta)
@@ -474,17 +482,17 @@ void Vector2VectorRotation(const double v1[3], const double v2[3], double rmat[3
 }
 
 /**
- * @brief Apply rotation matrix to each quaterion stored in the pointing table 
- *  
- * This routine will apply a 3x3 rotation matrix to every record in the table. 
- * The table is assumed to be an InstrumentPointing compatible (CK) table 
+ * @brief Apply rotation matrix to each quaterion stored in the pointing table
+ *
+ * This routine will apply a 3x3 rotation matrix to every record in the table.
+ * The table is assumed to be an InstrumentPointing compatible (CK) table
  * containing at least four elements/row. The first four elements are assumed to
- * be quaterions that are converted to a matrix such that simple matrix 
- * multiplication is applied to achieve an updated pointing quaternion. The 
- * results are stored back into the table. 
- * 
+ * be quaterions that are converted to a matrix such that simple matrix
+ * multiplication is applied to achieve an updated pointing quaternion. The
+ * results are stored back into the table.
+ *
  * @author 2017-08-01 Kris Becker
- * 
+ *
  * @param R     The constant angular pointing matrix that will be applied
  * @param table Instrument pointing table containing quaternions
  */
diff --git a/isis/src/control/apps/findfeatures/AKAZEAlgorithm.cpp b/isis/src/control/apps/findfeatures/AKAZEAlgorithm.cpp
index c1b7f9c121eada93119e415a900e0d88f4122f16..43a733454016181fc50d033767ac9d782da93a73 100644
--- a/isis/src/control/apps/findfeatures/AKAZEAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/AKAZEAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,9 +20,9 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  AKAZEAlgorithm::AKAZEAlgorithm() : 
+  AKAZEAlgorithm::AKAZEAlgorithm() :
                   Feature2DAlgorithm("AKAZE", "Feature2D",
-                                     AKAZEType::create()) {  
+                                     AKAZEType::create()) {
     setupMaps();
     m_variables.merge(getAlgorithmVariables());
   }
@@ -43,13 +30,13 @@ namespace Isis {
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   AKAZEAlgorithm::AKAZEAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                  Feature2DAlgorithm("AKAZE", "Feature2D", 
+                  Feature2DAlgorithm("AKAZE", "Feature2D",
                                      AKAZEType::create(), cvars) {
     setupMaps();
     setConfig(config);
@@ -84,7 +71,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString AKAZEAlgorithm::description() const {
@@ -97,50 +84,50 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
-  Feature2DAlgorithm *AKAZEAlgorithm::create(const PvlFlatMap &vars, 
+  Feature2DAlgorithm *AKAZEAlgorithm::create(const PvlFlatMap &vars,
                                                             const QString &config) {
     return ( new AKAZEAlgorithm(vars, config) );
   }
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool AKAZEAlgorithm::hasDetector() const { 
-    return true; 
+  bool AKAZEAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool AKAZEAlgorithm::hasExtractor() const { 
-    return true; 
+  bool AKAZEAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool AKAZEAlgorithm::hasMatcher() const { 
-    return false; 
+  bool AKAZEAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap AKAZEAlgorithm::getAlgorithmVariables( ) const {
@@ -161,11 +148,11 @@ namespace Isis {
 
 /**
  * Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Number of variables actually set
- * 
+ *
  * @throws IException::User "The input value is not valid for AKAZE's [DescriptorType] variable"
  * @throws IException::User "The input value is not valid for AKAZE's [Diffusivity] variable"
  */
@@ -174,7 +161,7 @@ namespace Isis {
     AKAZEPtr algorithm = m_algorithm.dynamicCast<AKAZEType>();
 
     int numSet(0);
-    if ( variables.exists("DescriptorType") ) { 
+    if ( variables.exists("DescriptorType") ) {
       QString value = variables.get("DescriptorType");
       bool isInt;
       // Check if the value is an integer
@@ -198,27 +185,27 @@ namespace Isis {
       numSet++;
     }
 
-    if ( variables.exists("DescriptorSize") ) { 
+    if ( variables.exists("DescriptorSize") ) {
       algorithm->setDescriptorSize(toInt(variables.get("DescriptorSize")));
       numSet++;
     }
 
-    if ( variables.exists("DescriptorChannels") ) { 
+    if ( variables.exists("DescriptorChannels") ) {
       algorithm->setDescriptorChannels(toInt(variables.get("DescriptorChannels")));
       numSet++;
     }
 
-    if ( variables.exists("Threshold") ) { 
+    if ( variables.exists("Threshold") ) {
       algorithm->setThreshold(toInt(variables.get("Threshold")));
       numSet++;
     }
 
-    if ( variables.exists("NOctaves") ) { 
+    if ( variables.exists("NOctaves") ) {
       algorithm->setNOctaves(toInt(variables.get("NOctaves")));
       numSet++;
     }
 
-    if ( variables.exists("NOctaveLayers") ) { 
+    if ( variables.exists("NOctaveLayers") ) {
       algorithm->setNOctaveLayers(toInt(variables.get("NOctaveLayers")));
       numSet++;
     }
diff --git a/isis/src/control/apps/findfeatures/AKAZEAlgorithm.h b/isis/src/control/apps/findfeatures/AKAZEAlgorithm.h
index e35307f6d5104531af31edb1dc7c70dabc956378..01d26f317b2957b2517f634a5dfdcb3389923750 100644
--- a/isis/src/control/apps/findfeatures/AKAZEAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/AKAZEAlgorithm.h
@@ -1,26 +1,13 @@
 #ifndef AKAZEAlgorithm_h
 #define AKAZEAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/bimap.hpp>
 #include "FeatureAlgorithm.h"
@@ -32,15 +19,15 @@
 namespace Isis {
 
 /**
- * @brief AKAZE Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 AKAZE Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief AKAZE Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 AKAZE Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-07 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-07 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-07 Jesse Mapel - Original Version
  */
 
 class AKAZEAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
@@ -71,7 +58,7 @@ class AKAZEAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
     boost::bimap<QString, int> m_diffusivityMap;    /**!< Bi-directional map for converting
                                                           Diffusivity values.*/
 
-  
+
   private:
     typedef cv::AKAZE          AKAZEType;
     typedef cv::Ptr<AKAZEType> AKAZEPtr;
diff --git a/isis/src/control/apps/findfeatures/AgastAlgorithm.cpp b/isis/src/control/apps/findfeatures/AgastAlgorithm.cpp
index f22c4a9ca1686eddcecfbbb4d10bbfec70059ca5..1f8e04a267ace91440e7959be105fe29bcb7ea9d 100644
--- a/isis/src/control/apps/findfeatures/AgastAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/AgastAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "AgastAlgorithm.h"
 
@@ -28,9 +15,9 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  AgastAlgorithm::AgastAlgorithm() : 
+  AgastAlgorithm::AgastAlgorithm() :
                  Feature2DAlgorithm("AGAST", "Feature2D",
-                                    AgastType::create()) {  
+                                    AgastType::create()) {
     setupTypeMap();
     m_variables.merge( getAlgorithmVariables() );
   }
@@ -38,13 +25,13 @@ namespace Isis {
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   AgastAlgorithm::AgastAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                  Feature2DAlgorithm("AGAST", "Feature2D", 
+                  Feature2DAlgorithm("AGAST", "Feature2D",
                                      AgastType::create(), cvars) {
     setupTypeMap();
     setConfig(config);
@@ -61,7 +48,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString AgastAlgorithm::description() const {
@@ -85,7 +72,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -96,38 +83,38 @@ namespace Isis {
 
 
  /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool AgastAlgorithm::hasDetector() const { 
-    return true; 
+  bool AgastAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool AgastAlgorithm::hasExtractor() const { 
-    return false; 
+  bool AgastAlgorithm::hasExtractor() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
   bool AgastAlgorithm::hasMatcher() const {
-     return false; 
+     return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap AgastAlgorithm::getAlgorithmVariables( ) const {
@@ -142,11 +129,11 @@ namespace Isis {
 
 /**
  * Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Number of variables actually set
- * 
+ *
  * @throws IException::User "The input value is not valid for AGAST's [Type] variable"
  */
   int AgastAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) {
@@ -154,12 +141,12 @@ namespace Isis {
     AgastPtr algorithm = m_algorithm.dynamicCast<AgastType>();
 
     int numSet(0);
-    if ( variables.exists("NonmaxSuppression") ) { 
+    if ( variables.exists("NonmaxSuppression") ) {
       algorithm->setNonmaxSuppression(toInt(variables.get("NonmaxSuppression")));
       numSet++;
     }
 
-    if ( variables.exists("Threshold") ) { 
+    if ( variables.exists("Threshold") ) {
       algorithm->setThreshold(toInt(variables.get("Threshold")));
       numSet++;
     }
diff --git a/isis/src/control/apps/findfeatures/AgastAlgorithm.h b/isis/src/control/apps/findfeatures/AgastAlgorithm.h
index 154d0064162161f2c0c14c08d3bd71c2cb4c7924..e80b94744fa7b5f35dcc0bf6960f75d96b260e55 100644
--- a/isis/src/control/apps/findfeatures/AgastAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/AgastAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef AgastAlgorithm_h
 #define AgastAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 
@@ -32,15 +20,15 @@
 namespace Isis {
 
 /**
- * @brief AGAST Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 AGAST Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief AGAST Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 AGAST Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-07 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-07 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-07 Jesse Mapel - Original Version
  */
 
 class AgastAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/BRISKAlgorithm.cpp b/isis/src/control/apps/findfeatures/BRISKAlgorithm.cpp
index 14e286a6b79c4b87387ec22ec73b57858a337abc..8baf9667c2f3e319923248ef577c94ddd063420b 100644
--- a/isis/src/control/apps/findfeatures/BRISKAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/BRISKAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,22 +20,22 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  BRISKAlgorithm::BRISKAlgorithm() : 
+  BRISKAlgorithm::BRISKAlgorithm() :
                  Feature2DAlgorithm("BRISK", "Feature2D",
-                                    BRISKType::create()) {  
+                                    BRISKType::create()) {
     setupParameters();
   }
 
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   BRISKAlgorithm::BRISKAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                  Feature2DAlgorithm("BRISK", "Feature2D", 
+                  Feature2DAlgorithm("BRISK", "Feature2D",
                                      BRISKType::create(), cvars) {
    setConfig(config);
    PvlFlatMap variables = setupParameters();
@@ -83,8 +70,8 @@ namespace Isis {
    else {
      const int thresh = toInt(variables.get("Threshold"));
      const int octaves = toInt(variables.get("NOctaves"));
-     const float patternScale = variables.get("PatternScale").toFloat();  
-   
+     const float patternScale = variables.get("PatternScale").toFloat();
+
      m_algorithm = BRISKType::create(thresh, octaves, patternScale);
    }
     m_variables.merge(variables);
@@ -95,12 +82,12 @@ namespace Isis {
    * Destroys the algorithm
    */
   BRISKAlgorithm::~BRISKAlgorithm() { }
- 
+
 
   /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap BRISKAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -114,7 +101,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString BRISKAlgorithm::description() const {
@@ -127,7 +114,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -138,38 +125,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool BRISKAlgorithm::hasDetector() const { 
-    return true; 
+  bool BRISKAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool BRISKAlgorithm::hasExtractor() const { 
-    return true; 
+  bool BRISKAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool BRISKAlgorithm::hasMatcher() const { 
-    return false; 
+  bool BRISKAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap BRISKAlgorithm::getAlgorithmVariables( ) const {
@@ -179,11 +166,11 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Always -1, variables cannot be set after initialization.
- * 
+ *
  * @throws IException::Programmer "BRISKAlgorithm does not have the ability
  *                                 to set algorithm parameters."
  */
diff --git a/isis/src/control/apps/findfeatures/BRISKAlgorithm.h b/isis/src/control/apps/findfeatures/BRISKAlgorithm.h
index 295cf07fa15b0b381a07d45a7dc2f30fdf07abd3..e701428d2afcb0eeda9dce354e82bc706bff8cd9 100644
--- a/isis/src/control/apps/findfeatures/BRISKAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/BRISKAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef BRISKAlgorithm_h
 #define BRISKAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/features2d.hpp"
@@ -30,22 +18,22 @@
 namespace Isis {
 
 /**
- * @brief BRISK Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 BRISK Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief BRISK Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 BRISK Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-12 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-12 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-12 Jesse Mapel - Original Version
  */
 
 class BRISKAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
   //  OpenCV 3 API
   public:
     BRISKAlgorithm();
-    BRISKAlgorithm( const PvlFlatMap &cvars, const QString &config = QString() ); 
+    BRISKAlgorithm( const PvlFlatMap &cvars, const QString &config = QString() );
     virtual ~BRISKAlgorithm();
 
     QString description() const;
diff --git a/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.cpp b/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.cpp
index a015fa79e7222c28ba7c9d989c813c12723ed4fb..ab976b22a9761950466a3373f10468fc776b27fa 100644
--- a/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -32,22 +19,22 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  BlobDetectionAlgorithm::BlobDetectionAlgorithm() : 
+  BlobDetectionAlgorithm::BlobDetectionAlgorithm() :
                  Feature2DAlgorithm("Blob", "Feature2D",
-                                    BLOBType::create()) { 
+                                    BLOBType::create()) {
    setupParameters();
   }
 
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   BlobDetectionAlgorithm::BlobDetectionAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                          Feature2DAlgorithm("Blob", "Feature2D", 
+                          Feature2DAlgorithm("Blob", "Feature2D",
                                               BLOBType::create(), cvars) {
     setConfig(config);
     PvlFlatMap variables = setupParameters();
@@ -73,7 +60,7 @@ namespace Isis {
     params.minConvexity = variables.get("MinConvexity").toFloat();
     params.maxConvexity = variables.get("MaxConvexity").toFloat();
 
-    m_algorithm = BLOBType::create(params); 
+    m_algorithm = BLOBType::create(params);
 
     m_variables.merge(variables);
   }
@@ -86,9 +73,9 @@ namespace Isis {
 
 
   /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap BlobDetectionAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -118,7 +105,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString BlobDetectionAlgorithm::description() const {
@@ -131,7 +118,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -143,38 +130,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool BlobDetectionAlgorithm::hasDetector() const { 
-    return true; 
+  bool BlobDetectionAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool BlobDetectionAlgorithm::hasExtractor() const { 
-    return false; 
+  bool BlobDetectionAlgorithm::hasExtractor() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool BlobDetectionAlgorithm::hasMatcher() const { 
-    return false; 
+  bool BlobDetectionAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap BlobDetectionAlgorithm::getAlgorithmVariables( ) const{
@@ -184,11 +171,11 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Always -1, variables cannot be set after initialization.
- * 
+ *
  * @throws IException::Programmer "BlobDetectionAlgorithm does not have the ability
  *                                 to set algorithm parameters."
  */
diff --git a/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.h b/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.h
index 3f855b27878a19e639ddc92a7da6194bbcc347f9..f89a46632df1787d4943370947222f9059f051a9 100644
--- a/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef BlobDetectionAlgorithm_h
 #define BlobDetectionAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/features2d.hpp"
@@ -30,17 +18,17 @@
 namespace Isis {
 
 /**
- * @brief Blob detection algorithm 
- *  
- * This class provides the OpenCV3 Simple Blob Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief Blob detection algorithm
+ *
+ * This class provides the OpenCV3 Simple Blob Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-07 Jesse Mapel
- *  
- * @internal 
+ *
+ * @internal
  *   @history 2016-12-07 Jesse Mapel - Original Version
  *   @history 2016-12-23 Kristin Berry - Added hasDetector, hasExtractor, hasMatcher and reorganized
- *                                       constructor/create code. 
+ *                                       constructor/create code.
  */
 
 class BlobDetectionAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
@@ -48,7 +36,7 @@ class BlobDetectionAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgori
   public:
     BlobDetectionAlgorithm();
     BlobDetectionAlgorithm( const PvlFlatMap &cvars, const QString &config = QString() );
-                 
+
     virtual ~BlobDetectionAlgorithm();
 
     QString description() const;
diff --git a/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.cpp b/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.cpp
index e03b37ed288707a631f8117a07ca3a18ac3b26a7..d56fb75488ef01ef173328c97faf3d644fd0b64a 100644
--- a/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,23 +20,23 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  BriefDescriptorAlgorithm::BriefDescriptorAlgorithm() : 
+  BriefDescriptorAlgorithm::BriefDescriptorAlgorithm() :
                  Feature2DAlgorithm("Brief", "Feature2D",
-                                    BriefType::create()) {  
+                                    BriefType::create()) {
     setupParameters();
   }
 
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
-  BriefDescriptorAlgorithm::BriefDescriptorAlgorithm(const PvlFlatMap &cvars, 
+  BriefDescriptorAlgorithm::BriefDescriptorAlgorithm(const PvlFlatMap &cvars,
                                                      const QString &config) :
-                           Feature2DAlgorithm("Brief", "Feature2D", 
+                           Feature2DAlgorithm("Brief", "Feature2D",
                                                BriefType::create(), cvars) {
     setConfig(config);
     PvlFlatMap variables = setupParameters();
@@ -70,9 +57,9 @@ namespace Isis {
 
 
   /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap BriefDescriptorAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -85,7 +72,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString BriefDescriptorAlgorithm::description() const {
@@ -98,7 +85,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -112,38 +99,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool BriefDescriptorAlgorithm::hasDetector() const { 
-    return false; 
+  bool BriefDescriptorAlgorithm::hasDetector() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool BriefDescriptorAlgorithm::hasExtractor() const { 
-    return true; 
+  bool BriefDescriptorAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool BriefDescriptorAlgorithm::hasMatcher() const { 
-    return false; 
+  bool BriefDescriptorAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap BriefDescriptorAlgorithm::getAlgorithmVariables( ) const{
@@ -153,11 +140,11 @@ namespace Isis {
 
   /**
    * @brief Set parameters as provided by the variables
-   * 
+   *
    * @param variables Container of parameters to set
-   * 
+   *
    * @return @b int Always -1, variables cannot be set after initialization.
-   * 
+   *
    * @throws IException::Programmer "BriefDescriptorAlgorithm does not have the ability
    *                                 to set algorithm parameters."
    */
diff --git a/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.h b/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.h
index 476068820bc7feba5e9eeff0ea301bcb29c82d43..6cb995be316b310c425125c9f3d88537feb20397 100644
--- a/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef BriefDescriptorAlgorithm_h
 #define BriefDescriptorAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/xfeatures2d.hpp"
@@ -30,15 +18,15 @@
 namespace Isis {
 
 /**
- * @brief Brief descriptor algorithm 
- *  
- * This class provides the OpenCV3 Brief Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief Brief descriptor algorithm
+ *
+ * This class provides the OpenCV3 Brief Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-09 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-09 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-09 Jesse Mapel - Original Version
  */
 
 class BriefDescriptorAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/BruteForceMatcher.cpp b/isis/src/control/apps/findfeatures/BruteForceMatcher.cpp
index dd715650f56461bb5862e9855d0c4ac04b843114..517c1d1be6cdda9e4f00e1226f86420d7dfd422d 100644
--- a/isis/src/control/apps/findfeatures/BruteForceMatcher.cpp
+++ b/isis/src/control/apps/findfeatures/BruteForceMatcher.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "opencv2/opencv.hpp"
 #include "opencv2/xfeatures2d.hpp"
@@ -35,7 +22,7 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  BruteForceMatcher::BruteForceMatcher() : 
+  BruteForceMatcher::BruteForceMatcher() :
         DescriptorMatcherAlgorithm("BFMatcher", "DecriptorMatcher",
                                    cv::makePtr<cv::BFMatcher>()) {
     m_normTypeMap = setupNormTypeMap();
@@ -48,7 +35,7 @@ namespace Isis {
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -60,10 +47,10 @@ namespace Isis {
    * @param crossCheck If true; when j, the nearest neightbor to a point i, is
    *                   found it will be checked that i is the nearest neighbor
    *                   to j.  Defaults to false.
-   * 
+   *
    * @throws IException::User "The input value is not valid for
    *                           BruteForceMatcher's [NormType] variable"
-   * 
+   *
    * @see cv::NormTypes
    */
   BruteForceMatcher::BruteForceMatcher(const PvlFlatMap &cvars, const QString &config,
@@ -94,7 +81,7 @@ namespace Isis {
 
   /**
    * Sets up and returns the bi-directional map for norm type.
-   * 
+   *
    * @return @b boost:bimap<QString,int> The map between name and int for norm type.
    *
    * @see cv::NormTypes
@@ -113,7 +100,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString BruteForceMatcher::description() const {
@@ -126,11 +113,11 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
-   * 
+   *
    * @throws IException::User "The input value is not valid for
    *                           BruteForceMatcher's [NormType] variable"
    */
@@ -161,38 +148,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool BruteForceMatcher::hasDetector() const { 
-    return false; 
+  bool BruteForceMatcher::hasDetector() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool BruteForceMatcher::hasExtractor() const { 
-    return false; 
+  bool BruteForceMatcher::hasExtractor() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool BruteForceMatcher::hasMatcher() const { 
-    return true; 
+  bool BruteForceMatcher::hasMatcher() const {
+    return true;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap BruteForceMatcher::getAlgorithmVariables( ) const {
@@ -202,11 +189,11 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Always -1, variables cannot be set after initialization.
- * 
+ *
  * @throws IException::Programmer "BruteForceMatcher does not have the ability
  *                                 to set algorithm parameters."
  */
diff --git a/isis/src/control/apps/findfeatures/BruteForceMatcher.h b/isis/src/control/apps/findfeatures/BruteForceMatcher.h
index cf994d55d6cde5059747e98465374d24da7c3131..d65b6be9193c7163d07e54aa432da7137567f535 100644
--- a/isis/src/control/apps/findfeatures/BruteForceMatcher.h
+++ b/isis/src/control/apps/findfeatures/BruteForceMatcher.h
@@ -1,26 +1,14 @@
 #ifndef BruteForceMatcher_h
 #define BruteForceMatcher_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/bimap.hpp>
 #include "FeatureAlgorithm.h"
@@ -29,15 +17,15 @@
 namespace Isis {
 
 /**
- * @brief Brute Force Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 BFMatcher DescriptorMatcher algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief Brute Force Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 BFMatcher DescriptorMatcher algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-08 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-08 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-08 Jesse Mapel - Original Version
  */
 
 class BruteForceMatcher : public DescriptorMatcherAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/CropTransform.cpp b/isis/src/control/apps/findfeatures/CropTransform.cpp
index 5902b5484a8d1435452d025a8312d12b88c9513e..c7945da21b99487bd90a13d127306a344a1c7e94 100644
--- a/isis/src/control/apps/findfeatures/CropTransform.cpp
+++ b/isis/src/control/apps/findfeatures/CropTransform.cpp
@@ -1,26 +1,10 @@
-/**                                                                       
- * @file                                                                  
- * $Revision$
- * $Date$
- * $Id$
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */ 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 
 #include <string>
@@ -40,7 +24,7 @@
 namespace Isis {
 
 /* Constructor */
-CropTransform::CropTransform() : GenericTransform("CropTransform"), m_crop() { 
+CropTransform::CropTransform() : GenericTransform("CropTransform"), m_crop() {
 }
 
 /* Constructor with name of transform */
@@ -51,16 +35,16 @@ CropTransform::~CropTransform() { }
 
 /**
  * @brief Construct a full crop transform with specified region
- *  
- * This constructor will create an object that will crop a specified region of 
- * an image. 
- * 
+ *
+ * This constructor will create an object that will crop a specified region of
+ * an image.
+ *
  * @param name    Name of the transform
  * @param orgSize Original size of the image
  * @param tfSize  New size and starting line/samples of image
  * @param tform   Transformation of the crop
  */
-CropTransform::CropTransform(const QString &name, const cv::Size &orgSize, 
+CropTransform::CropTransform(const QString &name, const cv::Size &orgSize,
                              const cv::Size &tfSize, const cv::Mat &tform) :
                              GenericTransform(name, tform, orgSize) {
 
@@ -76,16 +60,16 @@ CropTransform::CropTransform(const QString &name, const cv::Size &orgSize,
 }
 
 /**
- * @brief Crop and image as specified in as a region 
- *  
- * The starting coordinates of the image region and size are provided to create 
- * a crop transform. 
- * 
+ * @brief Crop and image as specified in as a region
+ *
+ * The starting coordinates of the image region and size are provided to create
+ * a crop transform.
+ *
  * @param name   Name of transform
  * @param region Region of the image to crop
  */
-CropTransform::CropTransform(const QString &name, 
-                             const CropTransform::RectArea &region) : 
+CropTransform::CropTransform(const QString &name,
+                             const CropTransform::RectArea &region) :
                              GenericTransform(name), m_crop(region) {
   setMatrix(translation(-m_crop.x, -m_crop.y));
 
@@ -98,9 +82,9 @@ CropTransform::CropTransform(const QString &name,
 
 /**
  * @brief Crop the input image as specfied in the contructor
- * 
+ *
  * @param image Image to crop
- * 
+ *
  * @return cv::Mat Cropped region of the image
  */
 cv::Mat CropTransform::render(const cv::Mat &image) const {
@@ -112,14 +96,14 @@ cv::Mat CropTransform::render(const cv::Mat &image) const {
 
 /**
  * @brief Determine the crop elements of a given specification
- * 
+ *
  * @param tform  Matrix specification of the transform
  * @param imSize Input image size
  * @param tfSize Desired size of the cropped image
- * 
+ *
  * @return CropTransform::RectArea Specs of the region of the cropped image
  */
-CropTransform::RectArea CropTransform::findCrop(const cv::Mat &tform, 
+CropTransform::RectArea CropTransform::findCrop(const cv::Mat &tform,
                                                 const cv::Size &imSize,
                                                 const cv::Size &tfSize) const {
 
@@ -127,7 +111,7 @@ CropTransform::RectArea CropTransform::findCrop(const cv::Mat &tform,
   cv::perspectiveTransform(corners(imSize), t_corners, tform);
 
   double xmin(qMax(0.0f, t_corners[0].x)), xmax(xmin);
-  double ymin(qMax(0.0f, t_corners[0].y)), ymax(ymin); 
+  double ymin(qMax(0.0f, t_corners[0].y)), ymax(ymin);
   for (unsigned int i = 1 ; i < t_corners.size() ; i++) {
     if ( t_corners[i].x < xmin) xmin = t_corners[i].x;
     if ( t_corners[i].x > xmax) xmax = t_corners[i].x;
diff --git a/isis/src/control/apps/findfeatures/CropTransform.h b/isis/src/control/apps/findfeatures/CropTransform.h
index 91a4c6d24e138c72e1c9bb303dfb909809e9e699..68a8989569d310d4fe83d2255cd697c3ee7a717e 100644
--- a/isis/src/control/apps/findfeatures/CropTransform.h
+++ b/isis/src/control/apps/findfeatures/CropTransform.h
@@ -1,26 +1,14 @@
 #ifndef CropTransform_h
 #define CropTransform_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QList>
 #include <QString>
@@ -36,13 +24,13 @@ namespace Isis {
 
 /**
  * @brief Crop a section from an image using a translation (affine) transform
- *  
- * This image transform will crop a section of an image stored in an OpenCV 
- * matrix and return the cropped version of the image. 
- *  
- * @author 2015-10-01 Kris Becker 
- * @internal 
- *   @history 2015-10-01 Kris Becker - Original Version 
+ *
+ * This image transform will crop a section of an image stored in an OpenCV
+ * matrix and return the cropped version of the image.
+ *
+ * @author 2015-10-01 Kris Becker
+ * @internal
+ *   @history 2015-10-01 Kris Becker - Original Version
  */
 
 class CropTransform : public GenericTransform {
@@ -50,8 +38,8 @@ class CropTransform : public GenericTransform {
     typedef GenericTransform::RectArea   RectArea;
     CropTransform();
     CropTransform(const QString &name);
-    CropTransform(const QString &name, const cv::Size &orgSize, 
-                  const cv::Size &tfSize, const cv::Mat &tform); 
+    CropTransform(const QString &name, const cv::Size &orgSize,
+                  const cv::Size &tfSize, const cv::Mat &tform);
     CropTransform(const QString &name, const RectArea &region);
     virtual ~CropTransform();
 
diff --git a/isis/src/control/apps/findfeatures/DaisyAlgorithm.cpp b/isis/src/control/apps/findfeatures/DaisyAlgorithm.cpp
index ee2f8a55e20339e15f588d48f7b092538f458d66..30f03c701f785c6a280919f112dd126c2e0f29bb 100644
--- a/isis/src/control/apps/findfeatures/DaisyAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/DaisyAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "opencv2/opencv.hpp"
 #include "opencv2/xfeatures2d.hpp"
@@ -32,30 +19,30 @@
 namespace Isis {
 
   /**
-   * Constructs a default DaisyAlgorithm with default variables. Note the OpenCV 
+   * Constructs a default DaisyAlgorithm with default variables. Note the OpenCV
    * Daisy algorithm does not provide direct parameter access after construction
    * so all variable values must be know when constructed.
    */
   DaisyAlgorithm::DaisyAlgorithm() : Feature2DAlgorithm("DAISY", "Feature2D",
-                                                         DAISYType::create()) {  
+                                                         DAISYType::create()) {
     setupTypeMap();
     setupParameters();
   }
 
 
   /**
-   * Constructs a DaisyAlgorithm with input variables. 
-   *  
-   * This constuctor provides a custom Daisy algorithm that allows users to 
-   * provide specfic values for all algorithm parameters. 
-   *  
-   * H is an optional 3x3 homography matrix used to warp the grid of Daisy. If 
-   * not entereted, it will default to the identity matrix. 
-   *  
-   *  
-   * @throws IException::Programmer "Homography matrix, H, was not input as a string of the form 
-   *                   \"d,d,d,d,d,d,d,d,d\" where d is a double or integer numerical value." 
-   *  
+   * Constructs a DaisyAlgorithm with input variables.
+   *
+   * This constuctor provides a custom Daisy algorithm that allows users to
+   * provide specfic values for all algorithm parameters.
+   *
+   * H is an optional 3x3 homography matrix used to warp the grid of Daisy. If
+   * not entereted, it will default to the identity matrix.
+   *
+   *
+   * @throws IException::Programmer "Homography matrix, H, was not input as a string of the form
+   *                   \"d,d,d,d,d,d,d,d,d\" where d is a double or integer numerical value."
+   *
    * @param cvars Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
@@ -73,7 +60,7 @@ namespace Isis {
     int norm = m_typeMap.left.at(variables.get("norm"));
     cv::Mat H = cv::Mat::eye(3,3,CV_64FC1);
     if ( variables.exists("H")) {
-      // Convert H-string to a 3x3 matrix represented by a std::vector (opencv will accept this 
+      // Convert H-string to a 3x3 matrix represented by a std::vector (opencv will accept this
       // as an alternative to a cv::InputArray)
       QString Hparm = QString(variables.get("H"));
       QStringList elts = Hparm.split( "," );
@@ -81,7 +68,7 @@ namespace Isis {
       if (elts.size() != 9 ) {
         QString mess = "Homography matrix, H, was not input as a string of the form \"d,d,d,d,d,d,d,"
                        "d,d\" where d is a double or integer numerical value.";
-          throw IException(IException::Programmer, mess, _FILEINFO_); 
+          throw IException(IException::Programmer, mess, _FILEINFO_);
       }
 
       // potentially add a try/catch around this for failed .at's or .toDoubles
@@ -95,7 +82,7 @@ namespace Isis {
     bool interpolation = toBool(variables.get("interpolation"));
     bool use_orientation = toBool(variables.get("use_orientation"));
 
-    // Direct creation of DAISY algorithm, replacing default in constructor 
+    // Direct creation of DAISY algorithm, replacing default in constructor
     // initialization in FeatureAlgorithm::m_algorithm
     m_algorithm = DAISYType::create(radius, q_radius, q_theta, q_hist, norm, H,
                                     interpolation, use_orientation);
@@ -113,7 +100,7 @@ namespace Isis {
 
  /**
    * Returns a description of the DaisyAlgorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString DaisyAlgorithm::description() const {
@@ -137,52 +124,52 @@ namespace Isis {
 
 /**
  * Creates and returns an instance of DaisyAlgorithm.
- *  
+ *
  * @param vars PvlFlatMap containing algorithm parameters and their values
- * @param config A configuration string input by the user 
- *  
+ * @param config A configuration string input by the user
+ *
  * @return @b Feature2DAlgorithm A DaisyAlgorithm instance
  */
-  Feature2DAlgorithm *DaisyAlgorithm::create(const PvlFlatMap &vars, 
+  Feature2DAlgorithm *DaisyAlgorithm::create(const PvlFlatMap &vars,
                                             const QString &config) {
     return ( new DaisyAlgorithm(vars, config) );
   }
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool DaisyAlgorithm::hasDetector() const { 
-    return false; 
+  bool DaisyAlgorithm::hasDetector() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool DaisyAlgorithm::hasExtractor() const { 
-    return true; 
+  bool DaisyAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool DaisyAlgorithm::hasMatcher() const { 
-    return false; 
+  bool DaisyAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
 /**
  * Get and return DAISY's parameters and what they're set to as a PvlFlatMap.
- *  
- * @return PvlFlatMap A PvlFlatMap of DAISY's currently set variables and their values. 
+ *
+ * @return PvlFlatMap A PvlFlatMap of DAISY's currently set variables and their values.
  */
   PvlFlatMap DaisyAlgorithm::getAlgorithmVariables( ) const {
     return ( variables() );
@@ -190,33 +177,33 @@ namespace Isis {
 
 
 /**
- * @brief Set parameters as provided by the variables, does not work for the 
+ * @brief Set parameters as provided by the variables, does not work for the
  * DAISY algorithm in OpenCV3, so calling this will throw an exception.
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return int Number of variables actually set
  */
   int DaisyAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) {
     QString message = "DAISY does not have the ability to set algorithm parameters.";
-    throw IException(IException::Programmer, message, _FILEINFO_);   
+    throw IException(IException::Programmer, message, _FILEINFO_);
 
     return (-1);
   }
 
 
 /**
- * @brief Initiolize the Daisy default parameters according to documentation 
- *  
- * This methiod provides the Daisy algorithm parameter defaults according to the 
- * OpenCV documentation found at 
- * http://docs.opencv.org/3.1.0/d9/d37/classcv_1_1xfeatures2d_1_1DAISY.html. 
- *  
- * This will reset the Daisy parameters to the default conditions and cotnained 
- * in FeatureAlgorithm::m_variables. 
- *  
+ * @brief Initiolize the Daisy default parameters according to documentation
+ *
+ * This methiod provides the Daisy algorithm parameter defaults according to the
+ * OpenCV documentation found at
+ * http://docs.opencv.org/3.1.0/d9/d37/classcv_1_1xfeatures2d_1_1DAISY.html.
+ *
+ * This will reset the Daisy parameters to the default conditions and cotnained
+ * in FeatureAlgorithm::m_variables.
+ *
  * @author Kris Becker 2016-12-18
- * 
+ *
  * @return PvlFlatMap Container of all Daisy parameters
  */
   PvlFlatMap DaisyAlgorithm::setupParameters() {
@@ -226,7 +213,7 @@ namespace Isis {
     variables.add("q_theta", "8");
     variables.add("q_hist", "8");
     variables.add("norm", "NRM_NONE");
-    variables.add("H", "1,0,0,0,1,0,0,0,1"); 
+    variables.add("H", "1,0,0,0,1,0,0,0,1");
     variables.add("interpolation", "true");
     variables.add("use_orientation", "false");
     m_variables = variables;
@@ -235,4 +222,3 @@ namespace Isis {
 
 };
 // namespace Isis
-
diff --git a/isis/src/control/apps/findfeatures/DaisyAlgorithm.h b/isis/src/control/apps/findfeatures/DaisyAlgorithm.h
index 69cae4faec825e4815b88e9bdfe51521dbb1a2f3..0014cc0ed1462ce30a9ee52144fab11e28bb7781 100644
--- a/isis/src/control/apps/findfeatures/DaisyAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/DaisyAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef DaisyAlgorithm_h
 #define DaisyAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "DaisyExtractor.h"
 #include "FeatureAlgorithm.h"
@@ -34,15 +22,15 @@
 namespace Isis {
 
 /**
- * @brief Daisy Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 SURF Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief Daisy Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 SURF Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-11-30 Kristin Berry
- *  
- * @internal 
- *   @history 2016-11-30 Kristin Berry - Original Version 
+ *
+ * @internal
+ *   @history 2016-11-30 Kristin Berry - Original Version
  */
 
 class DaisyAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
@@ -51,8 +39,8 @@ class DaisyAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
     DaisyAlgorithm();
     DaisyAlgorithm(const PvlFlatMap &cvars, const QString &config = QString());
 #if 0
-    DaisyAlgorithm(float radius=15, int q_radius=3, int q_theta=8, int q_hist=8, 
-                   int norm=DAISY::NRM_NONE, InputArray H=noArray(), 
+    DaisyAlgorithm(float radius=15, int q_radius=3, int q_theta=8, int q_hist=8,
+                   int norm=DAISY::NRM_NONE, InputArray H=noArray(),
                    bool interpolation=true, bool use_orientation=false);
 #endif
     virtual ~DaisyAlgorithm();
@@ -62,7 +50,7 @@ class DaisyAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
     // Required for all algorithms
     static Feature2DAlgorithm  *create(const PvlFlatMap &vars,
                                       const QString &config = QString());
-    
+
     virtual bool hasDetector() const;
     virtual bool hasExtractor() const;
     virtual bool hasMatcher() const;
diff --git a/isis/src/control/apps/findfeatures/DaisyExtractor.cpp b/isis/src/control/apps/findfeatures/DaisyExtractor.cpp
index bc937aa89ebaf5ab5cd06e5266b6fc522c9fe06c..d2bb06d9977ac1c51e4ca09d922f70a063f0cfeb 100644
--- a/isis/src/control/apps/findfeatures/DaisyExtractor.cpp
+++ b/isis/src/control/apps/findfeatures/DaisyExtractor.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "DaisyExtractor.h"
 #include "IException.h"
 
@@ -7,127 +15,125 @@ namespace Isis {
 
 /**
  * Always throws an exception. This function is not actually implemented.
- * 
- * @param image image 
+ *
+ * @param image image
  * @param keypoints keypoints
  * @param descriptors descriptors
- *  
+ *
  * @throws IException::Programmer "Daisy is unable to run compute with these arguments."
  */
-  void DaisyExtractor::compute( cv::InputArray image, std::vector<cv::KeyPoint>& keypoints, 
+  void DaisyExtractor::compute( cv::InputArray image, std::vector<cv::KeyPoint>& keypoints,
                           cv::OutputArray descriptors ) {
     QString mess = "Daisy is unable to run compute with these arguments.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
 /**
- * Always throws an exception. This function is not actually implemented. 
- * 
+ * Always throws an exception. This function is not actually implemented.
+ *
  * @param image image
  * @param roi region of interest
  * @param descriptors descriptors
- *  
- * @throws IException::Programmer "Daisy is unable to run compute with these arguments." 
+ *
+ * @throws IException::Programmer "Daisy is unable to run compute with these arguments."
  */
   void DaisyExtractor::compute( cv::InputArray image, cv::Rect roi, cv::OutputArray descriptors ){
     QString mess = "Daisy is unable to run compute with these arguments.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
 /**
- * 
- * Always throws an exception. This function is not actually implemented. 
- * 
+ *
+ * Always throws an exception. This function is not actually implemented.
+ *
  * @param image image
- * @param descriptors descriptors 
- *  
+ * @param descriptors descriptors
+ *
  * @throws IException::Programmer "Daisy is unable to run compute with these arguments."
  */
   void DaisyExtractor::compute( cv::InputArray image, cv::OutputArray descriptors ){
     QString mess = "Daisy is unable to run compute with these arguments.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
 /**
  * Always throws an exception. This function is not actually implemented.
- * 
+ *
  * @param y y coordinate for descriptor
  * @param x x coordinate for descriptor
  * @param orientation orientation
  * @param descriptor descriptor
- *  
- * @throws IException::Programmer "Daisy cannot run GetDescriptor." 
+ *
+ * @throws IException::Programmer "Daisy cannot run GetDescriptor."
  */
-  void DaisyExtractor::GetDescriptor( double y, double x, int orientation, 
+  void DaisyExtractor::GetDescriptor( double y, double x, int orientation,
                                         float* descriptor ) const {
     QString mess = "Daisy cannot run GetDescriptor";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
 /**
  * Always throws an exception. This function is not actually implemented.
- * 
- * 
+ *
+ *
  * @param y y coordinate
  * @param x x coordinate
  * @param orientation orientation
  * @param descriptor descriptor
  * @param H transformation matrix
- *  
- * @throws IException::Programmer "Daisy cannot run GetDescriptor." 
- *  
+ *
+ * @throws IException::Programmer "Daisy cannot run GetDescriptor."
+ *
  * @return @b bool Always false.
  */
-  bool DaisyExtractor::GetDescriptor( double y, double x, int orientation, float* descriptor, 
+  bool DaisyExtractor::GetDescriptor( double y, double x, int orientation, float* descriptor,
                                       double* H ) const {
     QString mess = "Daisy cannot run GetDescriptor.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
     return false;
     }
-  
+
 /**
- * 
- * Always throws an exception. This function is not actually implemented. 
- *  
+ *
+ * Always throws an exception. This function is not actually implemented.
+ *
  * @param y y coordinate
  * @param x x coordinate
  * @param orientation orientation
  * @param descriptor descriptor
- *  
+ *
  * @throws IException::Programmer "Daisy cannot run GetUnnormalizedDescriptor."
  */
 
-  void DaisyExtractor::GetUnnormalizedDescriptor( double y, double x, int orientation, 
+  void DaisyExtractor::GetUnnormalizedDescriptor( double y, double x, int orientation,
                                             float* descriptor ) const {
     QString mess = "Daisy cannot run GetUnnormalizedDescriptor.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
-  
+
 
 /**
- * Always throws an exception. This function is not actually implemented. * 
- *  
+ * Always throws an exception. This function is not actually implemented. *
+ *
  * @param y y coordinate
  * @param x x coordinate
  * @param orientation orientation
  * @param descriptor descriptor
  * @param H transformation matrix
- *  
+ *
  * @throws IException::Programmer "Daisy cannot run GetUnnormalizedDescriptor."
- * 
- * @return @b bool Always false. 
+ *
+ * @return @b bool Always false.
  */
-  bool DaisyExtractor::GetUnnormalizedDescriptor( double y, double x, int orientation, 
+  bool DaisyExtractor::GetUnnormalizedDescriptor( double y, double x, int orientation,
                                             float* descriptor , double *H ) const {
     QString mess = "Daisy cannot run GetUnnormalizedDescriptor.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
     return false;
   }
 
 };
-
-
diff --git a/isis/src/control/apps/findfeatures/DaisyExtractor.h b/isis/src/control/apps/findfeatures/DaisyExtractor.h
index 5a8a7652586180207a46ac8d82693529731f4969..f021f271414141e94ef2bc9a82eef4d4d2381223 100644
--- a/isis/src/control/apps/findfeatures/DaisyExtractor.h
+++ b/isis/src/control/apps/findfeatures/DaisyExtractor.h
@@ -1,28 +1,36 @@
 #ifndef DaisyExtractor_h
 #define DaisyExtractor_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "opencv2/xfeatures2d.hpp"
 #include "opencv2/opencv.hpp"
 
 namespace Isis {
 
 /**
- * @brief Wrap of OpenCV3 DAISY algorithm to implement pure virtual functions. 
- *  
- * This class wraps the abstract DAISY algorithm so it can be used. 
- *  
- * @author 2016-12-20 Kristin Berry 
- *  
- * @internal 
- *  @history 2016-12-20 Kristin Berry - Original Version 
- *  
+ * @brief Wrap of OpenCV3 DAISY algorithm to implement pure virtual functions.
+ *
+ * This class wraps the abstract DAISY algorithm so it can be used.
+ *
+ * @author 2016-12-20 Kristin Berry
+ *
+ * @internal
+ *  @history 2016-12-20 Kristin Berry - Original Version
+ *
  */
 
-class DaisyExtractor : public cv::xfeatures2d::DAISY {  
+class DaisyExtractor : public cv::xfeatures2d::DAISY {
 
 public:
 
-    virtual void compute( cv::InputArray image, std::vector<cv::KeyPoint>& keypoints, 
+    virtual void compute( cv::InputArray image, std::vector<cv::KeyPoint>& keypoints,
                           cv::OutputArray descriptors );
 
     virtual void compute( cv::InputArray image, cv::Rect roi, cv::OutputArray descriptors );
@@ -31,16 +39,15 @@ public:
 
     virtual void GetDescriptor( double y, double x, int orientation, float* descriptor ) const;
 
-    virtual bool GetDescriptor( double y, double x, int orientation, float* descriptor, 
+    virtual bool GetDescriptor( double y, double x, int orientation, float* descriptor,
                                 double* H ) const;
 
-    virtual void GetUnnormalizedDescriptor( double y, double x, int orientation, 
+    virtual void GetUnnormalizedDescriptor( double y, double x, int orientation,
                                             float* descriptor ) const;
 
-    virtual bool GetUnnormalizedDescriptor( double y, double x, int orientation, 
+    virtual bool GetUnnormalizedDescriptor( double y, double x, int orientation,
                                             float* descriptor , double *H ) const;
 };
 
 }
 #endif
-
diff --git a/isis/src/control/apps/findfeatures/FASTAlgorithm.cpp b/isis/src/control/apps/findfeatures/FASTAlgorithm.cpp
index b9e55efe62d27cd92f50a73a8d27e400433d28c1..ef818fd6831f65786ab259c408b2a9b0c0c2bd09 100644
--- a/isis/src/control/apps/findfeatures/FASTAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/FASTAlgorithm.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,9 +19,9 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  FASTAlgorithm::FASTAlgorithm() : 
+  FASTAlgorithm::FASTAlgorithm() :
                  Feature2DAlgorithm("FAST", "Feature2D",
-                                    FASTType::create()) {  
+                                    FASTType::create()) {
     setupTypeMap();
     m_variables.merge( getAlgorithmVariables() );
   }
@@ -43,13 +29,13 @@ namespace Isis {
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   FASTAlgorithm::FASTAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                  Feature2DAlgorithm("FAST", "Feature2D", 
+                  Feature2DAlgorithm("FAST", "Feature2D",
                                      FASTType::create(), cvars) {
     setupTypeMap();
     setConfig(config);
@@ -66,7 +52,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString FASTAlgorithm::description() const {
@@ -89,7 +75,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -100,38 +86,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool FASTAlgorithm::hasDetector() const { 
-    return true; 
+  bool FASTAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool FASTAlgorithm::hasExtractor() const { 
-    return false; 
+  bool FASTAlgorithm::hasExtractor() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool FASTAlgorithm::hasMatcher() const { 
-    return false; 
+  bool FASTAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap FASTAlgorithm::getAlgorithmVariables( ) const {
@@ -146,11 +132,11 @@ namespace Isis {
 
 /**
  * Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Number of variables actually set
- * 
+ *
  * @throws IException::User "The input value is not valid for FAST's [Type] variable"
  */
   int FASTAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) {
@@ -158,12 +144,12 @@ namespace Isis {
     FASTPtr algorithm = m_algorithm.dynamicCast<FASTType>();
 
     int numSet(0);
-    if ( variables.exists("NonmaxSuppression") ) { 
+    if ( variables.exists("NonmaxSuppression") ) {
       algorithm->setNonmaxSuppression(toInt(variables.get("NonmaxSuppression")));
       numSet++;
     }
 
-    if ( variables.exists("Threshold") ) { 
+    if ( variables.exists("Threshold") ) {
       algorithm->setThreshold(toInt(variables.get("Threshold")));
       numSet++;
     }
diff --git a/isis/src/control/apps/findfeatures/FASTAlgorithm.h b/isis/src/control/apps/findfeatures/FASTAlgorithm.h
index bd39917c78c0686559f770d8ea6cba4caaedce32..3cb83342f9f122c06252f8ce85e4cbb9c16c7299 100644
--- a/isis/src/control/apps/findfeatures/FASTAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/FASTAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef FASTAlgorithm_h
 #define FASTAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/bimap.hpp>
 #include "FeatureAlgorithm.h"
@@ -32,15 +20,15 @@
 namespace Isis {
 
 /**
- * @brief FAST Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 FAST Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief FAST Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 FAST Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-07 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-07 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-07 Jesse Mapel - Original Version
  */
 
 class FASTAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/FREAKAlgorithm.cpp b/isis/src/control/apps/findfeatures/FREAKAlgorithm.cpp
index 419e631def8d12d784b19e3b2b15b504b9a0fc3e..05c56a571e55523a154684cdfac4cfc25414a91b 100644
--- a/isis/src/control/apps/findfeatures/FREAKAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/FREAKAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,22 +20,22 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  FREAKAlgorithm::FREAKAlgorithm() : 
+  FREAKAlgorithm::FREAKAlgorithm() :
                  Feature2DAlgorithm("FREAK", "Feature2D",
-                                    FREAKType::create()) {  
+                                    FREAKType::create()) {
     setupParameters();
   }
 
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   FREAKAlgorithm::FREAKAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                  Feature2DAlgorithm("FREAK", "Feature2D", 
+                  Feature2DAlgorithm("FREAK", "Feature2D",
                                      FREAKType::create(), cvars) {
     setConfig(config);
     PvlFlatMap variables = setupParameters();
@@ -65,7 +52,7 @@ namespace Isis {
       }
     }
 
-    m_algorithm = FREAKType::create(orientationNormalized, scaleNormalized, patternScale, 
+    m_algorithm = FREAKType::create(orientationNormalized, scaleNormalized, patternScale,
                                     nOctaves, selectedPairs);
 
     m_variables.merge(variables);
@@ -73,9 +60,9 @@ namespace Isis {
 
 
  /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap FREAKAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -97,7 +84,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString FREAKAlgorithm::description() const {
@@ -110,7 +97,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -121,38 +108,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool FREAKAlgorithm::hasDetector() const { 
-    return false; 
+  bool FREAKAlgorithm::hasDetector() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool FREAKAlgorithm::hasExtractor() const { 
-    return true; 
+  bool FREAKAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool FREAKAlgorithm::hasMatcher() const { 
-    return false; 
+  bool FREAKAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap FREAKAlgorithm::getAlgorithmVariables( ) const {
@@ -162,11 +149,11 @@ namespace Isis {
 
   /**
    * @brief Set parameters as provided by the variables
-   * 
+   *
    * @param variables Container of parameters to set
-   * 
+   *
    * @return @b int Always -1, variables cannot be set after initialization.
-   * 
+   *
    * @throws IException::Programmer "FREAKAlgorithm does not have the ability
    *                                 to set algorithm parameters."
    */
diff --git a/isis/src/control/apps/findfeatures/FREAKAlgorithm.h b/isis/src/control/apps/findfeatures/FREAKAlgorithm.h
index eae8a5db659e97709001a4c73f726bb79cb59bc3..261868ede7f53a7b5fba8aaa9f8f43a96ebc2b34 100644
--- a/isis/src/control/apps/findfeatures/FREAKAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/FREAKAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef FREAKAlgorithm_h
 #define FREAKAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 #include <QVariant>
@@ -28,15 +16,15 @@
 namespace Isis {
 
 /**
- * @brief FREAK Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 FREAK Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief FREAK Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 FREAK Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-12 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-12 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-12 Jesse Mapel - Original Version
  */
 
 class FREAKAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/FastGeom.cpp b/isis/src/control/apps/findfeatures/FastGeom.cpp
index 638d90bbaabeb9ceed6a9ad574bd1dc8684941bd..250a854de495d3753b41142a2e3199094b87b730 100644
--- a/isis/src/control/apps/findfeatures/FastGeom.cpp
+++ b/isis/src/control/apps/findfeatures/FastGeom.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <opencv2/opencv.hpp>
 
@@ -28,17 +15,17 @@
 namespace Isis {
 
 /* Constructor */
-FastGeom::FastGeom() : m_fastpts(25), m_tolerance(1.0), m_geomtype("camera"), 
-                       m_maxarea(3.0), m_parameters() { 
+FastGeom::FastGeom() : m_fastpts(25), m_tolerance(1.0), m_geomtype("camera"),
+                       m_maxarea(3.0), m_parameters() {
   validate(m_geomtype);
 }
 
 /* Construct with parameters */
-FastGeom::FastGeom(const PvlFlatMap &parameters) : m_fastpts(25), 
-                                                   m_tolerance(1.0), 
+FastGeom::FastGeom(const PvlFlatMap &parameters) : m_fastpts(25),
+                                                   m_tolerance(1.0),
                                                    m_geomtype("camera"),
                                                    m_maxarea(3.0),
-                                                   m_parameters(parameters) { 
+                                                   m_parameters(parameters) {
   m_fastpts   = toInt(m_parameters.get("FastGeomPoints", "25"));
   m_tolerance = toDouble(m_parameters.get("FastGeomTolerance", "1.0"));
   m_geomtype  = m_parameters.get("GeomType", "camera").toLower();
@@ -48,9 +35,9 @@ FastGeom::FastGeom(const PvlFlatMap &parameters) : m_fastpts(25),
 
 /* Construct with individual parameters to compute the fast geom transform */
 FastGeom::FastGeom(const int maxpts, const double tolerance, const bool crop,
-         const bool preserve, const double &maxarea) : 
+         const bool preserve, const double &maxarea) :
          m_fastpts(maxpts), m_tolerance(tolerance), m_geomtype("camera"),
-         m_maxarea(maxarea), m_parameters() { 
+         m_maxarea(maxarea), m_parameters() {
   validate(m_geomtype);
 }
 
@@ -58,19 +45,19 @@ FastGeom::FastGeom(const int maxpts, const double tolerance, const bool crop,
 FastGeom::~FastGeom() { }
 
 /**
- * @brief Compute train->query fast geom transformation 
- *  
+ * @brief Compute train->query fast geom transformation
+ *
  *  This method computes a fast geometric transform that "projects" the train
  *  image into the query image space. This method assumes both images have
  *  camera models or map projections that can compute longitude/latitude
  *  coordinates from sample/line coordinates and back.
- *  
+ *
  *  The query line/samples coordinates are converted to latitude/longitude
  *  coordinates. The latitude/longitude coordinates are then used in the train
  *  image to compute its corresponding line/sample. A minimum number of points
  *  (m_fastpts) are computed to create a perspective transform that maps image
  *  coordinates of the two images.
- *  
+ *
  * @param query            Query image
  * @param train            Train image
  * @return ImageTransform* Pointer to FastGeom transform
@@ -84,25 +71,25 @@ ImageTransform *FastGeom::compute(MatchImage &query, MatchImage &train)  {
   RectArea tSize(0.0f, 0.0f, train.source().samples(), train.source().lines() );
 
   // std::cout << "Train-to-query mapping...\n";
-  cv::Mat t_to_q = train.source().getGeometryMapping(query.source(), 
-                                                     m_fastpts, 
-                                                     m_tolerance); 
+  cv::Mat t_to_q = train.source().getGeometryMapping(query.source(),
+                                                     m_fastpts,
+                                                     m_tolerance);
 
   // The above matrix is for simply computing the direct fastgeom of the
   // training image into the image space of the query image, just like
   // cam2cam does.
-  // 
+  //
   // Now consider cropping to only the mininmum common coverage or
   // preserving all the train image in the transformation (this option can
   // be really big and is not recommended for some situations!).
-   
-  // Set up the transform pointer for applying the desired affect. Do 
+
+  // Set up the transform pointer for applying the desired affect. Do
   // preserve option first.
   QScopedPointer<GenericTransform> fastg(0);
   if ( "map" == m_geomtype ) {
     // Compute preserved image output size and translation matrix
     cv::Mat tMat;
-    RectArea tSizeFull = ImageTransform::transformedSize(t_to_q, 
+    RectArea tSizeFull = ImageTransform::transformedSize(t_to_q,
                                                          tSize.size(),
                                                          tMat);
     // std::cout << "FullTrain: " << tSizeFull << "\n";
@@ -111,7 +98,7 @@ ImageTransform *FastGeom::compute(MatchImage &query, MatchImage &train)  {
     // same size as the output image below.
     if ( tSizeFull.area()  < (m_maxarea * qSize.area()) ) {
       // std::cout << "Use direct full mapping of Train-to-Query...\n";
-      fastg.reset(new GenericTransform("FastGeomMap", t_to_q, 
+      fastg.reset(new GenericTransform("FastGeomMap", t_to_q,
                                        tSizeFull));
     }
   }
@@ -119,24 +106,24 @@ ImageTransform *FastGeom::compute(MatchImage &query, MatchImage &train)  {
 
     // Crop train image to only common area in query image using inverse
     // std::cout << "Compute train to query BB...\n";
-    RectArea qbbox = ImageTransform::boundingBox( t_to_q.inv(), qSize, 
+    RectArea qbbox = ImageTransform::boundingBox( t_to_q.inv(), qSize,
                                                    tSize.size());
     // std::cout << "TrainBB: " << qbbox << "\n";
 
 
     // std::cout << "Compute query to train BB...\n";
-    RectArea tbbox = ImageTransform::boundingBox( t_to_q, qbbox, 
+    RectArea tbbox = ImageTransform::boundingBox( t_to_q, qbbox,
                                                    qSize.size());
 
     // std::cout << "MapBB: " << tbbox << "\n";
-    fastg.reset(new GenericTransform("FastGeomCrop", t_to_q, tbbox)); 
+    fastg.reset(new GenericTransform("FastGeomCrop", t_to_q, tbbox));
   }
 
  // If a mapper has not been allocated, allocate mapping to query image size
  // (as cam2cam does).
   if ( fastg.isNull() ) {
     // std::cout << "FastGeom cam2map map created...\n";
-    fastg.reset(new GenericTransform("FastGeomCamera", t_to_q, qSize.size())); 
+    fastg.reset(new GenericTransform("FastGeomCamera", t_to_q, qSize.size()));
   }
 
   return ( fastg.take() );
@@ -149,12 +136,12 @@ void FastGeom::apply(MatchImage &query, MatchImage &train) {
 }
 
 /**
- * @brief Checks for valid fast geom transform options 
- *  
- * This method checks that geomtype is "camera", "crop" or "map". If some other 
- * value is found, an exception is thrown. 
- * 
- * @param geomtype String specification of geom type - must be camera, crop or 
+ * @brief Checks for valid fast geom transform options
+ *
+ * This method checks that geomtype is "camera", "crop" or "map". If some other
+ * value is found, an exception is thrown.
+ *
+ * @param geomtype String specification of geom type - must be camera, crop or
  *                 map
  */
 void FastGeom::validate( const QString &geomtype ) const {
@@ -168,4 +155,3 @@ void FastGeom::validate( const QString &geomtype ) const {
 }
 
 }  // namespace Isis
-
diff --git a/isis/src/control/apps/findfeatures/FastGeom.h b/isis/src/control/apps/findfeatures/FastGeom.h
index 1725feecb909061eba33bd140db1847a3b957d5c..b795b98b2d02b3192469ac27e4d5ff148d2ef3ce 100644
--- a/isis/src/control/apps/findfeatures/FastGeom.h
+++ b/isis/src/control/apps/findfeatures/FastGeom.h
@@ -1,26 +1,14 @@
 #ifndef FastGeom_h
 #define FastGeom_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QList>
 #include <QString>
@@ -38,31 +26,31 @@ class ImageTransform;
 
 /**
  * @brief Compute fast geom transform for pair of images
- *  
- * This class computes a fast geometric transformation of a query and train 
- * image pair using available geometry. 
- *  
- * It is assumed the two images have overlapping regions and in these regions 
- * there are geometries that map from one image to the other. 
- *  
- * There are three types of fast geometric transforms that are computed in this 
- * class: camera, crop and map. 
- *  
- * The camera fast geom works in the same way that the ISIS application cam2map 
- * works. It transforms the train image directly into camera space of the query 
- * image. The crop fast transform option computes the common area of overlap of 
- * the train image and minimumizes the outputs size of the transformed image. 
- * The map fast transform behaves just like cam2map where the output image is 
- * fully retained and projected into the camera space. This option has the 
- * highest degree of problems that can occur particularly if the image scales 
- * differ significantly. 
- *  
- * The resulting fast geom transform is added to the train transform list. This 
+ *
+ * This class computes a fast geometric transformation of a query and train
+ * image pair using available geometry.
+ *
+ * It is assumed the two images have overlapping regions and in these regions
+ * there are geometries that map from one image to the other.
+ *
+ * There are three types of fast geometric transforms that are computed in this
+ * class: camera, crop and map.
+ *
+ * The camera fast geom works in the same way that the ISIS application cam2map
+ * works. It transforms the train image directly into camera space of the query
+ * image. The crop fast transform option computes the common area of overlap of
+ * the train image and minimumizes the outputs size of the transformed image.
+ * The map fast transform behaves just like cam2map where the output image is
+ * fully retained and projected into the camera space. This option has the
+ * highest degree of problems that can occur particularly if the image scales
+ * differ significantly.
+ *
+ * The resulting fast geom transform is added to the train transform list. This
  * approach is well suited for the template MatchMaker::foreachpPair method.
- *  
- * @author 2015-10-01 Kris Becker 
- * @internal 
- *   @history 2015-10-01 Kris Becker - Original Version 
+ *
+ * @author 2015-10-01 Kris Becker
+ * @internal
+ *   @history 2015-10-01 Kris Becker - Original Version
  *   @history 2016-04-06 Kris Becker Created .cpp file and completed documentation
  */
 
diff --git a/isis/src/control/apps/findfeatures/FeatureAlgorithm.h b/isis/src/control/apps/findfeatures/FeatureAlgorithm.h
index fcd06684fb77ffaf081fa2c1c37e8aac0032f0de..9b2edd58049c8eb999c5d6ae988fdda255866488 100644
--- a/isis/src/control/apps/findfeatures/FeatureAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/FeatureAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef FeatureAlgorithm_h
 #define FeatureAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "IException.h"
 #include "PvlFlatMap.h"
@@ -39,38 +27,38 @@
 namespace Isis {
 
 /**
- * @brief Wrapper for generic algorithm OpenCV3 feature matcher algorithms 
- *  
- * This class provides a generic wrapper that is intended to restore some of the 
- * functionality for these algorithms that were lost in the upgrade from version 
- * 2. Hence, the class T is intended to be an OpenCV Ptr type that contains 
- * either a Feature2D or DescriptorMatcher algorithm pointer. 
- *  
- * However, the design does lend itself to overide some the OpenCV specifics 
- * if needed. 
- *  
- * The OpenCV implementation can simply extract and populate the 
- * the PvlFlatMap variable structure to allow the default 
- * implementation to serve up the algorithm variables to the 
- * calling environment - or provide a specific implementation if 
- * inadequate. 
- *  
- * The config variable provides a direct way to store how the 
- * invocation string in the form of 
- * "algorithmname@var:value@var:value...". 
- *  
+ * @brief Wrapper for generic algorithm OpenCV3 feature matcher algorithms
+ *
+ * This class provides a generic wrapper that is intended to restore some of the
+ * functionality for these algorithms that were lost in the upgrade from version
+ * 2. Hence, the class T is intended to be an OpenCV Ptr type that contains
+ * either a Feature2D or DescriptorMatcher algorithm pointer.
+ *
+ * However, the design does lend itself to overide some the OpenCV specifics
+ * if needed.
+ *
+ * The OpenCV implementation can simply extract and populate the
+ * the PvlFlatMap variable structure to allow the default
+ * implementation to serve up the algorithm variables to the
+ * calling environment - or provide a specific implementation if
+ * inadequate.
+ *
+ * The config variable provides a direct way to store how the
+ * invocation string in the form of
+ * "algorithmname@var:value@var:value...".
+ *
  * @author  2016-11-30 Kris Becker
- *  
- * @internal 
- *   @history 2016-11-30 Kris Becker - Original Version 
+ *
+ * @internal
+ *   @history 2016-11-30 Kris Becker - Original Version
  */
 
 template <class T> class FeatureAlgorithm {
   public:
     FeatureAlgorithm();
     FeatureAlgorithm(const QString &name, const QString &type);
-    FeatureAlgorithm(const QString &name, const QString &type, 
-                     const T algorithm, 
+    FeatureAlgorithm(const QString &name, const QString &type,
+                     const T algorithm,
                      const PvlFlatMap &variables = PvlFlatMap());
     virtual ~FeatureAlgorithm();
 
@@ -86,7 +74,7 @@ template <class T> class FeatureAlgorithm {
     void    setConfig(const QString &config);
     QString config() const;
 
-    // Setter/getter for algorithm variable    
+    // Setter/getter for algorithm variable
     virtual bool setVariable(const QString &var, const QString &value);
     virtual QString getVariable(const QString &var,
                                 const QString &separator = ",");
@@ -130,42 +118,42 @@ template <class T> class FeatureAlgorithm {
 
 /**
  * @brief Default constructor, which is likely needed but useless
- * 
- * @author 2016-12-07 Kris Becker 
+ *
+ * @author 2016-12-07 Kris Becker
  */
-template <class T> FeatureAlgorithm<T>::FeatureAlgorithm() : 
-                                         m_name("FeatureAlgorithm"), 
-                                         m_type("Algorithm"), m_config(), 
+template <class T> FeatureAlgorithm<T>::FeatureAlgorithm() :
+                                         m_name("FeatureAlgorithm"),
+                                         m_type("Algorithm"), m_config(),
                                          m_algorithm(), m_variables() {  }
 
 
 /**
- * @brief Construct a named feature algorithm 
- *  
- * This constructor is partially valid but assumes the deriving class defines 
- * the algoritm after construction 
- * 
- * @author 2016-12-07 Kris Becker 
- * 
+ * @brief Construct a named feature algorithm
+ *
+ * This constructor is partially valid but assumes the deriving class defines
+ * the algoritm after construction
+ *
+ * @author 2016-12-07 Kris Becker
+ *
  * @param name  Name of algorithm
  * @param type  Type of Algorithm, typically "Feature2D" or "DecriptorMatcher"
  */
-template <class T> FeatureAlgorithm<T>::FeatureAlgorithm(const QString &name, 
-                                                         const QString &type) : 
-                                                         m_name(name), 
-                                                         m_type(type), 
-                                                         m_config(), 
+template <class T> FeatureAlgorithm<T>::FeatureAlgorithm(const QString &name,
+                                                         const QString &type) :
+                                                         m_name(name),
+                                                         m_type(type),
+                                                         m_config(),
                                                          m_algorithm(),
                                                          m_variables() {  }
 
 /**
- * @brief Construct a complete algorithm 
- *  
- * This constructor will provide a complete algorithm with the parameters 
- * provided. 
- * 
- * @author 2016-12-07 Kris Becker 
- * 
+ * @brief Construct a complete algorithm
+ *
+ * This constructor will provide a complete algorithm with the parameters
+ * provided.
+ *
+ * @author 2016-12-07 Kris Becker
+ *
  * @param name       Name of algorithm
  * @param type       Type of Algorithm, typically "Feature2D" or "DecriptorMatcher"
  * @param algorithm  Algorithm (assumed to be a cv::Ptr-type parameter
@@ -173,34 +161,34 @@ template <class T> FeatureAlgorithm<T>::FeatureAlgorithm(const QString &name,
  */
 template <class T> FeatureAlgorithm<T>::FeatureAlgorithm(const QString &name,
                                                          const QString &type,
-                                                         const T algorithm, 
-                                                         const PvlFlatMap &variables) : 
-                                                         m_name(name), 
-                                                         m_type(type), 
-                                                         m_config(), 
-                                                         m_algorithm(algorithm), 
+                                                         const T algorithm,
+                                                         const PvlFlatMap &variables) :
+                                                         m_name(name),
+                                                         m_type(type),
+                                                         m_config(),
+                                                         m_algorithm(algorithm),
                                                          m_variables(variables) { }
 
 /** Destructor */
 template <class T> FeatureAlgorithm<T>::~FeatureAlgorithm() { }
 
 /**
- * @brief Check validity of algorithm 
- *  
- * The default implementation is to simply test if the cv::Ptr is valid. 
- * Derived classes can reimplement this method if needed. 
- * 
- * @author 2016-12-07 Kris Becker 
- * 
+ * @brief Check validity of algorithm
+ *
+ * The default implementation is to simply test if the cv::Ptr is valid.
+ * Derived classes can reimplement this method if needed.
+ *
+ * @author 2016-12-07 Kris Becker
+ *
  * @return bool Returns true if all is well, false if not
  */
 template <class T> bool FeatureAlgorithm<T>::isValid() const {
-  return ( !m_algorithm.empty() ); 
+  return ( !m_algorithm.empty() );
 }
 
 /** Return the name of the algorithm */
 template <class T> QString FeatureAlgorithm<T>::name() const {
-  return ( m_name ); 
+  return ( m_name );
 }
 
 /** Returns the type of the algorithm   */
@@ -215,44 +203,44 @@ template <class T> QString FeatureAlgorithm<T>::description() const {
 
 /** Set the config string if appropriate (typically seen at higher level) */
 template <class T> void FeatureAlgorithm<T>::setConfig(const QString &config) {
-   m_config = config; 
+   m_config = config;
 }
 
 /** Return the config string */
 template <class T> QString FeatureAlgorithm<T>::config() const {
-  return ( m_config ); 
+  return ( m_config );
 }
 
 /**
- * @brief Set an algorithm variable to a specific value 
- *  
- * The parameters provided in this method are deferred to the 
- * setAlgorithmVariables() method that derived classes must implement. A 
- * PvlFlatMap of the value is constructed and passed into the derived routine 
- * that implenents the setting of all variables. The derived class must return 
- * the number of valid variables set, which in this case is expected to be 1, 
- * which is tested for success. If it fails, an exception is thrown. The 
- * deriving class can also throw an exception if indicated, which is trapped 
- * and propagated up the call chain. 
- *  
- * If the setting succeeds the value is added to the existing Pvl container to 
- * maintain consistent states of the algorithm variable settings. 
- *  
- * If the needed, the deriving class can reimplement this method if the 
- * behavior is not acceptable. 
- *  
- * @author 2016-12-07 Kris Becker 
- * 
+ * @brief Set an algorithm variable to a specific value
+ *
+ * The parameters provided in this method are deferred to the
+ * setAlgorithmVariables() method that derived classes must implement. A
+ * PvlFlatMap of the value is constructed and passed into the derived routine
+ * that implenents the setting of all variables. The derived class must return
+ * the number of valid variables set, which in this case is expected to be 1,
+ * which is tested for success. If it fails, an exception is thrown. The
+ * deriving class can also throw an exception if indicated, which is trapped
+ * and propagated up the call chain.
+ *
+ * If the setting succeeds the value is added to the existing Pvl container to
+ * maintain consistent states of the algorithm variable settings.
+ *
+ * If the needed, the deriving class can reimplement this method if the
+ * behavior is not acceptable.
+ *
+ * @author 2016-12-07 Kris Becker
+ *
  * @param var   Name of variable to set. Deriving classes should not expect
  *              case insensitive variable names. Note PvlFlatMap is case
- *              insensitive. 
+ *              insensitive.
  * @param value String value to set
- * 
- * @return bool True if the variable was successfully set. A false condition 
- *              will never be returned as an exception is thrown on failure. 
+ *
+ * @return bool True if the variable was successfully set. A false condition
+ *              will never be returned as an exception is thrown on failure.
  */
 template <class T> bool FeatureAlgorithm<T>::setVariable(const QString &var,
-                                                      const QString &value) { 
+                                                      const QString &value) {
       PvlFlatMap variable;
       variable.add(var, value);
       try {
@@ -267,54 +255,54 @@ template <class T> bool FeatureAlgorithm<T>::setVariable(const QString &var,
       }
 
       m_variables.merge(variable);
-      return (true); 
+      return (true);
     }
 
 /**
  * @brief Return the values of an algorithm parameter
- *  
- * This method returns the value of an algorithm as it is currently set. 
- *  
- * @author 2016-12-12 Kris Becker 
- * 
+ *
+ * This method returns the value of an algorithm as it is currently set.
+ *
+ * @author 2016-12-12 Kris Becker
+ *
  * @param var  Name of variable to retrieve
- * 
- * @return QString The value of the variable. Multiple values are separateed by 
+ *
+ * @return QString The value of the variable. Multiple values are separateed by
  *         commas.
  */
 template <class T> QString FeatureAlgorithm<T>::getVariable(const QString &var,
-                                                            const QString &separator) { 
+                                                            const QString &separator) {
       if ( m_variables.exists(var) ) {
         return (m_variables.allValues(var).join(separator));
       }
-      return (QString()); 
+      return (QString());
     }
 
 /**
- * @brief Set variable with value contained in a QVariant 
- *  
- * This method is for those algorithm uncommon variable types that are not 
- * suitable to be represented as a string or may require special consideration 
- * (such as higher precision of doubles). The default implementation, however, 
- * attempts to convert the QVariant content to a string and apply it using the 
- * setAlgorithmnVariables() method. 
- *  
- * Deriving classes can reimplement this method should it need specialized 
- * value treatment. 
- * 
- * @author 2016-12-07 Kris Becker 
- * 
- * @param name Name of variable to set 
+ * @brief Set variable with value contained in a QVariant
+ *
+ * This method is for those algorithm uncommon variable types that are not
+ * suitable to be represented as a string or may require special consideration
+ * (such as higher precision of doubles). The default implementation, however,
+ * attempts to convert the QVariant content to a string and apply it using the
+ * setAlgorithmnVariables() method.
+ *
+ * Deriving classes can reimplement this method should it need specialized
+ * value treatment.
+ *
+ * @author 2016-12-07 Kris Becker
+ *
+ * @param name Name of variable to set
  * @param var  QVariant containing the value to appy in the algorithm
- * 
- * @return bool True if successful, however failures result in a thrown 
+ *
+ * @return bool True if successful, however failures result in a thrown
  *              exception
  */
 template <class T> bool FeatureAlgorithm<T>::setVariable(const QString &vname,
-                                                         const QVariant &var) { 
+                                                         const QVariant &var) {
       QString value = var.toString();
-      if ( value.isEmpty() ) { 
-        QString mess = "Variant/variable " + vname + 
+      if ( value.isEmpty() ) {
+        QString mess = "Variant/variable " + vname +
                        " cannot be converted in " + name();
         throw IException(IException::Programmer, mess, _FILEINFO_);
       }
@@ -327,30 +315,30 @@ template <class T> bool FeatureAlgorithm<T>::setVariable(const QString &vname,
       }
 
       m_variables.merge(variable);
-      return (true); 
+      return (true);
     }
 
 /**
- * @brief Retreive an algorithm variable in a QVariant 
- *  
- * This method is provided for algorithm variable types that are not well 
- * suited for representation in strings. One such example may be a cv::Mat 
- * variable type. 
- *  
- * This method should be reimplemented by deriving classes with special 
- * variable types if needed. The deffault behavior is to convert the parameter 
- * data to a QStringList. 
- * 
- * @author 2016-12-07 Kris Becker 
- * 
+ * @brief Retreive an algorithm variable in a QVariant
+ *
+ * This method is provided for algorithm variable types that are not well
+ * suited for representation in strings. One such example may be a cv::Mat
+ * variable type.
+ *
+ * This method should be reimplemented by deriving classes with special
+ * variable types if needed. The deffault behavior is to convert the parameter
+ * data to a QStringList.
+ *
+ * @author 2016-12-07 Kris Becker
+ *
  * @param var   Name of variable to retrieve its value from
  * @param value A QVariont to return the value in
- * 
- * @return bool True if successful, however failures result in a thrown 
+ *
+ * @return bool True if successful, however failures result in a thrown
  *              exception
  */
 template <class T> bool FeatureAlgorithm<T>::getVariable(const QString &var,
-                                                         QVariant &value) { 
+                                                         QVariant &value) {
       value = QVariant(QStringList());
       if ( m_variables.exists(var) ) {
         if ( m_variables.count(var) > 0 ) {
@@ -358,7 +346,7 @@ template <class T> bool FeatureAlgorithm<T>::getVariable(const QString &var,
         }
         return (true);
       }
-      return (false); 
+      return (false);
     }
 
 /** Returns the PvlFlatMap containing all the variable/values as
@@ -369,11 +357,11 @@ template <class T> const PvlFlatMap &FeatureAlgorithm<T>::variables() const {
 
 /**
  * @brief Create an object structure of algorithm definition
- * 
- * @author 2016-12-07 Kris Becker 
- * 
+ *
+ * @author 2016-12-07 Kris Becker
+ *
  * @param objname   Optional name for the PvlObject of the description
- * 
+ *
  * @return PvlObject PvlObject containing a description of the algorithm
  */
 template <class T> PvlObject FeatureAlgorithm<T>::info(const QString &objname) const {
@@ -406,9 +394,9 @@ template <class T> PvlFlatMap FeatureAlgorithm<T>::getAlgorithmVariables() const
 
 
 template <class T> int FeatureAlgorithm<T>::setAlgorithmVariables(const PvlFlatMap &variables) {
-  throw IException(IException::Programmer, "Derived classes must reimplement this method", 
+  throw IException(IException::Programmer, "Derived classes must reimplement this method",
                    _FILEINFO_);
-  
+
   return (0);
 }
 
diff --git a/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.cpp b/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.cpp
index 719f033ec4a3d50b935a036e0e8b27a126a98eb1..a263f1945587c142c02f4448b19d1a78a4091dce 100644
--- a/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.cpp
+++ b/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.cpp
@@ -1,26 +1,11 @@
-/**
- * @file
- * $Revision$
- * $Date$
- * $Id$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cstdarg>
 #include <cstdio>
 #include <string>
diff --git a/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.h b/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.h
index 5fafa9d0854689d4c2682cee1c10b3dbdf8d4e10..65583757714786e3939d7ea87be8f651d7e6de31 100644
--- a/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.h
+++ b/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.h
@@ -1,26 +1,14 @@
 #ifndef FeatureAlgorithmFactory_h
 #define FeatureAlgorithmFactory_h
-/**
- * @file
- * $Revision $
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cstdarg>
 #include <istream>
 #include <ostream>
diff --git a/isis/src/control/apps/findfeatures/FeatureInventory.cpp b/isis/src/control/apps/findfeatures/FeatureInventory.cpp
index 9b5eafe64b9380930422141c74f21b073a007153..22fe97118c3faad84234fa09d9763945c07e4fac 100644
--- a/isis/src/control/apps/findfeatures/FeatureInventory.cpp
+++ b/isis/src/control/apps/findfeatures/FeatureInventory.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 
@@ -32,7 +19,7 @@
 #include "FeatureInventory.h"
 
 namespace Isis {
-  FeatureInventory::FeatureInventory() : m_theFeatureCreator(), 
+  FeatureInventory::FeatureInventory() : m_theFeatureCreator(),
                                          m_theMatcherCreator()  { }
 
 
@@ -43,11 +30,11 @@ namespace Isis {
                              FeatureInventory::FeatureCreator maker,
                              const QStringList &aliases) {
 
-    // Add the fundamental 
-    int v_made(0);    
+    // Add the fundamental
+    int v_made(0);
     // There cannot be withspace at the begging or end of the name - its okay
     // to embed them.
-    QString v_name = name.toLower().trimmed(); 
+    QString v_name = name.toLower().trimmed();
     m_theFeatureCreator.insert(v_name, maker);
     v_made++;
 
@@ -58,11 +45,11 @@ namespace Isis {
        QString l_name = a_name.toLower().trimmed();
        m_theFeatureCreator.insert(l_name, maker);
        v_made++;
-       if ( l_name.contains(QRegularExpression("^detector\\.*", 
+       if ( l_name.contains(QRegularExpression("^detector\\.*",
                                                QRegularExpression::CaseInsensitiveOption) ) ) {
          m_detectorNames.append( l_name.toLower() );
        }
-       if ( a_name.contains(QRegularExpression("^extractor\\.*", 
+       if ( a_name.contains(QRegularExpression("^extractor\\.*",
                                                QRegularExpression::CaseInsensitiveOption) ) ) {
          m_extractorNames.append( l_name.toLower() );
        }
@@ -77,9 +64,9 @@ namespace Isis {
                              FeatureInventory::MatcherCreator maker,
                              const QStringList &aliases) {
     int v_made(0);
-    // There cannot be whitespace at the begining or end of the name - its okay 
-    // to embed them. 
-    QString v_name = name.toLower().trimmed(); 
+    // There cannot be whitespace at the begining or end of the name - its okay
+    // to embed them.
+    QString v_name = name.toLower().trimmed();
     m_theMatcherCreator.insert(v_name, maker);
     m_matcherNames.append( name.toLower() );
     v_made++;
@@ -87,7 +74,7 @@ namespace Isis {
     // Add all aliases. Expected to of form "detector.name, extractor.name",
     // etc....
     BOOST_FOREACH ( QString a_name, aliases ) {
-      QString l_name = a_name.toLower().trimmed(); 
+      QString l_name = a_name.toLower().trimmed();
       if ( !l_name.isEmpty() ) {
         m_theMatcherCreator.insert(l_name, maker);
       }
@@ -108,7 +95,7 @@ namespace Isis {
 
     QString name = parts.takeFirst().toLower().trimmed();
     PvlFlatMap variables = parameters(parts);
-    
+
     if ( m_theFeatureCreator.contains(name) ) {
       FeatureCreator creator = m_theFeatureCreator.value(name);
       return ( creator( variables, config) );
@@ -133,7 +120,7 @@ namespace Isis {
     return ( algo );
   }
 
-  
+
   FeatureAlgorithmPtr FeatureInventory::getExtractor(const QString &config) const {
     FeatureAlgorithmPtr algo = getFeature(config);
     if ( !algo->hasExtractor() ) {
@@ -202,7 +189,7 @@ namespace Isis {
       else {
         QString mess = "Algorithm [" + algorithmName +
                       "] is not a supported OpenCV3 algorithm.";
-        throw IException(IException::User, mess, _FILEINFO_); 
+        throw IException(IException::User, mess, _FILEINFO_);
       }
 
       algorithmObject += aliases( lowerName );
@@ -237,7 +224,7 @@ namespace Isis {
     else {
       QString mess = "Algorithm [" + algorithmName +
                      "] is not a supported OpenCV3 algorithm.";
-      throw IException(IException::Programmer, mess, _FILEINFO_); 
+      throw IException(IException::Programmer, mess, _FILEINFO_);
     }
 
     return ( aliasKey );
@@ -279,7 +266,7 @@ namespace Isis {
 
 
   /** Split the string with the provided separator in individual parts   */
-   QStringList FeatureInventory::parse(const QString &config, 
+   QStringList FeatureInventory::parse(const QString &config,
                                        const QString &sep) const {
      return ( config.split(sep, QString::SkipEmptyParts) );
    }
@@ -301,4 +288,3 @@ namespace Isis {
    }
 
 };
-
diff --git a/isis/src/control/apps/findfeatures/FeatureInventory.h b/isis/src/control/apps/findfeatures/FeatureInventory.h
index 55bcbc167dfcb14912fc8c8e420d93047d28f40a..a22fd159b5ad1a3f50308af6c16875b10b804cd3 100644
--- a/isis/src/control/apps/findfeatures/FeatureInventory.h
+++ b/isis/src/control/apps/findfeatures/FeatureInventory.h
@@ -1,26 +1,14 @@
 #ifndef FeatureInventory_h
 #define FeatureInventory_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "IException.h"
 #include "PvlFlatMap.h"
@@ -38,38 +26,38 @@
 namespace Isis {
 
 /**
- * @brief Wrapper for generic algorithm OpenCV3 feature matcher algorithms 
- *  
- * This class provides a generic wrapper that is intended to restore some of the 
- * functionality for these algorithms that were lost in the upgrade from version 
- * 2. Hence, the class T is intended to be an OpenCV Ptr type that contains 
- * either a Feature2D or DescriptorMatcher algorithm pointer. 
- *  
- * However, the design does lend itself to overide some the OpenCV specifics 
- * if needed. 
- *  
- * The OpenCV implementation can simply extract and populate the 
- * the PvlFlatMap variable structure to allow the default 
- * implementation to serve up the algorithm variables to the 
- * calling environment - or provide a specific implementation if 
- * inadequate. 
- *  
- * The config variable provides a direct way to store how the 
- * invocation string in the form of 
- * "algorithmname@var:value@var:value...". 
- *  
+ * @brief Wrapper for generic algorithm OpenCV3 feature matcher algorithms
+ *
+ * This class provides a generic wrapper that is intended to restore some of the
+ * functionality for these algorithms that were lost in the upgrade from version
+ * 2. Hence, the class T is intended to be an OpenCV Ptr type that contains
+ * either a Feature2D or DescriptorMatcher algorithm pointer.
+ *
+ * However, the design does lend itself to overide some the OpenCV specifics
+ * if needed.
+ *
+ * The OpenCV implementation can simply extract and populate the
+ * the PvlFlatMap variable structure to allow the default
+ * implementation to serve up the algorithm variables to the
+ * calling environment - or provide a specific implementation if
+ * inadequate.
+ *
+ * The config variable provides a direct way to store how the
+ * invocation string in the form of
+ * "algorithmname@var:value@var:value...".
+ *
  * @author  2016-11-30 Kris Becker
- *  
- * @internal 
- *   @history 2016-11-30 Kris Becker - Original Version 
+ *
+ * @internal
+ *   @history 2016-11-30 Kris Becker - Original Version
  */
 
 class FeatureInventory {
   public:
     // Creator and storage types
-    typedef Feature2DAlgorithm* (*FeatureCreator)(const PvlFlatMap &object, 
+    typedef Feature2DAlgorithm* (*FeatureCreator)(const PvlFlatMap &object,
                                                   const QString &config);
-    typedef DescriptorMatcherAlgorithm* (*MatcherCreator)(const PvlFlatMap &object, 
+    typedef DescriptorMatcherAlgorithm* (*MatcherCreator)(const PvlFlatMap &object,
                                                   const QString &config);
 
     FeatureInventory();
@@ -143,7 +131,7 @@ class FeatureInventory {
 
       return ( numAliases );
     }
-    
+
   private:
 
     typedef QMap<QString, FeatureCreator>  Features;
diff --git a/isis/src/control/apps/findfeatures/FeatureMatcherTypes.h b/isis/src/control/apps/findfeatures/FeatureMatcherTypes.h
index 8895ce3f9a991a815b3421979dffa2d3e9f4df14..33d9c98426ca802cef9680137684f43b0a2c1c4d 100644
--- a/isis/src/control/apps/findfeatures/FeatureMatcherTypes.h
+++ b/isis/src/control/apps/findfeatures/FeatureMatcherTypes.h
@@ -1,26 +1,14 @@
 #ifndef FeatureMatcherTypes_h
 #define FeatureMatcherTypes_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <vector>
 
diff --git a/isis/src/control/apps/findfeatures/FlannBasedMatcher.cpp b/isis/src/control/apps/findfeatures/FlannBasedMatcher.cpp
index 91fd9ffe3aa344ddbd5307e9f6298e706f4d8f24..7af08f726364ce45657537b0cdb76429e554503b 100644
--- a/isis/src/control/apps/findfeatures/FlannBasedMatcher.cpp
+++ b/isis/src/control/apps/findfeatures/FlannBasedMatcher.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 
@@ -37,7 +24,7 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  FlannBasedMatcher::FlannBasedMatcher() : 
+  FlannBasedMatcher::FlannBasedMatcher() :
         DescriptorMatcherAlgorithm("FlannBasedMatcher", "DecriptorMatcher",
                                    cv::makePtr<cv::FlannBasedMatcher>()) {
     PvlFlatMap variables;
@@ -50,7 +37,7 @@ namespace Isis {
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -77,7 +64,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString FlannBasedMatcher::description() const {
@@ -90,7 +77,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -106,38 +93,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool FlannBasedMatcher::hasDetector() const { 
-    return false; 
+  bool FlannBasedMatcher::hasDetector() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool FlannBasedMatcher::hasExtractor() const { 
-    return false; 
+  bool FlannBasedMatcher::hasExtractor() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool FlannBasedMatcher::hasMatcher() const { 
-    return true; 
+  bool FlannBasedMatcher::hasMatcher() const {
+    return true;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap FlannBasedMatcher::getAlgorithmVariables( ) const {
@@ -147,17 +134,17 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Always -1, variables cannot be set after initialization.
- * 
+ *
  * @throws IException::Programmer "FlannBasedMatcher does not have the ability
  *                                 to set algorithm parameters."
  */
   int FlannBasedMatcher::setAlgorithmVariables(const PvlFlatMap &variables) {
     QString msg = "FlannBasedMatcher does not have the ability to set algorithm parameters.";
-    throw IException(IException::Programmer, msg, _FILEINFO_);   
+    throw IException(IException::Programmer, msg, _FILEINFO_);
 
     return (-1);
   }
diff --git a/isis/src/control/apps/findfeatures/FlannBasedMatcher.h b/isis/src/control/apps/findfeatures/FlannBasedMatcher.h
index 244fe87f371835d5237f8e02ceb28e5cf417a2b8..30f5083f807c66f0c55c70e80d5fed1d6f0e300b 100644
--- a/isis/src/control/apps/findfeatures/FlannBasedMatcher.h
+++ b/isis/src/control/apps/findfeatures/FlannBasedMatcher.h
@@ -1,26 +1,14 @@
 #ifndef FlannBasedMatcher_h
 #define FlannBasedMatcher_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 #include <QVariant>
@@ -28,15 +16,15 @@
 namespace Isis {
 
 /**
- * @brief Flann Based Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 FlannBasedMatcher DescriptorMatcher algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief Flann Based Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 FlannBasedMatcher DescriptorMatcher algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-08 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-08 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-08 Jesse Mapel - Original Version
  */
 
 class FlannBasedMatcher : public DescriptorMatcherAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/GFTTAlgorithm.cpp b/isis/src/control/apps/findfeatures/GFTTAlgorithm.cpp
index 0cc07ee61590dfb43b535ec40b43e5cf729c783f..aa3335fe8c9ffd00f0c353863d773eb79199dbf9 100644
--- a/isis/src/control/apps/findfeatures/GFTTAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/GFTTAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,22 +20,22 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  GFTTAlgorithm::GFTTAlgorithm() : 
+  GFTTAlgorithm::GFTTAlgorithm() :
                  Feature2DAlgorithm("GFTT", "Feature2D",
-                                    GFTTType::create()) {  
+                                    GFTTType::create()) {
     m_variables.merge(getAlgorithmVariables());
   }
 
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   GFTTAlgorithm::GFTTAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                  Feature2DAlgorithm("GFTT", "Feature2D", 
+                  Feature2DAlgorithm("GFTT", "Feature2D",
                                      GFTTType::create(), cvars) {
     setConfig(config);
     setAlgorithmVariables(cvars);
@@ -64,7 +51,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString GFTTAlgorithm::description() const {
@@ -77,7 +64,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -88,38 +75,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool GFTTAlgorithm::hasDetector() const { 
-    return true; 
+  bool GFTTAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool GFTTAlgorithm::hasExtractor() const { 
-    return false; 
+  bool GFTTAlgorithm::hasExtractor() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool GFTTAlgorithm::hasMatcher() const { 
-    return false; 
+  bool GFTTAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap GFTTAlgorithm::getAlgorithmVariables( ) const {
@@ -137,9 +124,9 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return int Number of variables actually set
  */
   int GFTTAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) {
@@ -147,32 +134,32 @@ namespace Isis {
     GFTTPtr algorithm = m_algorithm.dynamicCast<GFTTType>();
 
     int nset(0);
-    if ( variables.exists("MaxFeatures") ) { 
+    if ( variables.exists("MaxFeatures") ) {
       algorithm->setMaxFeatures(toInt(variables.get("MaxFeatures")));
       nset++;
     }
 
-    if ( variables.exists("QualityLevel") ) { 
+    if ( variables.exists("QualityLevel") ) {
       algorithm->setQualityLevel(toDouble(variables.get("QualityLevel")));
       nset++;
     }
 
-    if ( variables.exists("MinDistance") ) { 
+    if ( variables.exists("MinDistance") ) {
       algorithm->setMinDistance(toDouble(variables.get("MinDistance")));
       nset++;
     }
 
-    if ( variables.exists("BlockSize") ) { 
+    if ( variables.exists("BlockSize") ) {
       algorithm->setBlockSize(toInt(variables.get("BlockSize")));
       nset++;
     }
 
-    if ( variables.exists("HarrisDetector") ) { 
+    if ( variables.exists("HarrisDetector") ) {
       algorithm->setHarrisDetector(toBool(variables.get("HarrisDetector")));
       nset++;
     }
 
-    if ( variables.exists("K") ) { 
+    if ( variables.exists("K") ) {
       algorithm->setK(toDouble(variables.get("K")));
       nset++;
     }
diff --git a/isis/src/control/apps/findfeatures/GFTTAlgorithm.h b/isis/src/control/apps/findfeatures/GFTTAlgorithm.h
index f722fe509882ddf51916f7856d7fd39b4c317b07..6443c5ea08b62409b633bfcb1d4845c5e0d4496c 100644
--- a/isis/src/control/apps/findfeatures/GFTTAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/GFTTAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef GFTTAlgorithm_h
 #define GFTTAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/features2d.hpp"
@@ -30,15 +18,15 @@
 namespace Isis {
 
 /**
- * @brief GFTT Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 GFTT Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief GFTT Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 GFTT Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-07 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-07 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-07 Jesse Mapel - Original Version
  */
 
 class GFTTAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/GenericTransform.cpp b/isis/src/control/apps/findfeatures/GenericTransform.cpp
index 97da82763019aa0961d71e27682d66552cd45773..0ee97f036bc0645c9bddea7995737592f30bd8e5 100644
--- a/isis/src/control/apps/findfeatures/GenericTransform.cpp
+++ b/isis/src/control/apps/findfeatures/GenericTransform.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision$
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 #include <QSharedPointer>
diff --git a/isis/src/control/apps/findfeatures/GenericTransform.h b/isis/src/control/apps/findfeatures/GenericTransform.h
index c1acafc46bc340dba1c69cac3de09edb555a93ec..650a8b4242349ecb25d3d18208e907e5980af372 100644
--- a/isis/src/control/apps/findfeatures/GenericTransform.h
+++ b/isis/src/control/apps/findfeatures/GenericTransform.h
@@ -1,26 +1,14 @@
 #ifndef GenericTransform_h
 #define GenericTransform_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QString>
 #include <QSharedPointer>
@@ -32,16 +20,16 @@
 namespace Isis {
 
 /**
- * @brief Apply a generic transform using a matrix with various options 
- *  
- * This class privides a generic interface to the ImageTransform image and point 
- * transform conversion transform. It supports the transform with a specified 
- * 3x3 matrix and optional sizing operations. 
- *  
- * @author 2014-07-01 Kris Becker 
- * @internal 
- *   @history 2014-07-01 Kris Becker - Original Version 
- *   @history 2016-03-08 Kris Becker Created .cpp from header and completed 
+ * @brief Apply a generic transform using a matrix with various options
+ *
+ * This class privides a generic interface to the ImageTransform image and point
+ * transform conversion transform. It supports the transform with a specified
+ * 3x3 matrix and optional sizing operations.
+ *
+ * @author 2014-07-01 Kris Becker
+ * @internal
+ *   @history 2014-07-01 Kris Becker - Original Version
+ *   @history 2016-03-08 Kris Becker Created .cpp from header and completed
  *                           documentation
  */
 class GenericTransform : public ImageTransform {
@@ -59,7 +47,7 @@ class GenericTransform : public ImageTransform {
 
     cv::Mat getMatrix() const;
     cv::Mat getInverse() const;
-     
+
     cv::Size getSize(const cv::Mat &image = cv::Mat()) const;
 
     virtual cv::Mat render(const cv::Mat &image) const;
diff --git a/isis/src/control/apps/findfeatures/ImageSource.cpp b/isis/src/control/apps/findfeatures/ImageSource.cpp
index a6a09dafbf080e192ea7a713c9a52884c51cd783..9b34419cbcf88ad0916645e1461c5cf8b2091bcb 100644
--- a/isis/src/control/apps/findfeatures/ImageSource.cpp
+++ b/isis/src/control/apps/findfeatures/ImageSource.cpp
@@ -1,27 +1,10 @@
-/**                                                                       
- 4 @file                                                                  
- * $Revision$
- * $Date$
- * $Id$
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */ 
+/** This is free and unencumbered software released into the public domain.
 
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -64,22 +47,22 @@ namespace Isis {
 
 ImageSource::ImageSource() :  m_data( new SourceData() ) { }
 
-ImageSource::ImageSource(const QString &name, 
+ImageSource::ImageSource(const QString &name,
                          const bool geometryOnly,
                          const double minPercent,
-                         const double maxPercent) : 
+                         const double maxPercent) :
                          m_data( new SourceData(name) ) {
 
   if ( geometryOnly == true) {
     initGeometry();
   }
   else {
-    load(name, minPercent, maxPercent); 
+    load(name, minPercent, maxPercent);
   }
 }
 
 ImageSource::ImageSource(const QString &name, const cv::Mat &image,
-                         const QString &identity) : 
+                         const QString &identity) :
                          m_data( new SourceData(name, image, identity) )  {
   if ( identity.isEmpty() ) {
     m_data->m_serialno = m_data->m_name;
@@ -87,7 +70,7 @@ ImageSource::ImageSource(const QString &name, const cv::Mat &image,
 }
 
 ImageSource::ImageSource(const ImageSource &other,
-                         const bool getGeometry) : m_data( other.m_data ) { 
+                         const bool getGeometry) : m_data( other.m_data ) {
   if ( getGeometry == true ) {
     initGeometry();
   }
@@ -140,7 +123,7 @@ void ImageSource::load(const double minPercent,const double maxPercent) {
   QString name = m_data->m_name;
   FileName ifile(name);
 
-  // Handle ISIS cube specifically. If its not a cube, use OpenCV's image 
+  // Handle ISIS cube specifically. If its not a cube, use OpenCV's image
   // reader
   if ( "cub" == ifile.extension() ) {
     Cube cube;
@@ -150,7 +133,7 @@ void ImageSource::load(const double minPercent,const double maxPercent) {
     cube.open(ifile.expanded(), "r");
 
     if( cube.bandCount() != 1 ) {
-      QString msg = "Input cube " + name + " must only have one band!"; 
+      QString msg = "Input cube " + name + " must only have one band!";
       throw IException(IException::User, msg, _FILEINFO_);
     }
 
@@ -195,9 +178,9 @@ void ImageSource::load(const double minPercent,const double maxPercent) {
         }
       }
     }
-    catch (IException &ie) { 
-       throw IException(ie, IException::Programmer, 
-                         "Could not read and create grayscale image from " + 
+    catch (IException &ie) {
+       throw IException(ie, IException::Programmer,
+                         "Could not read and create grayscale image from " +
                           name, _FILEINFO_);
     }
   }
@@ -205,7 +188,7 @@ void ImageSource::load(const double minPercent,const double maxPercent) {
     // Assume OpenCV can read it
     try {
       m_data->m_image = cv::imread(ifile.expanded().toStdString(),
-                                   CV_LOAD_IMAGE_GRAYSCALE); 
+                                   CV_LOAD_IMAGE_GRAYSCALE);
       if ( m_data->m_image.empty() ) {
         QString mess = "Failed to read image from " + name;
         throw IException(IException::User, mess, _FILEINFO_);
@@ -217,7 +200,7 @@ void ImageSource::load(const double minPercent,const double maxPercent) {
     }
     catch (cv::Exception &e) {
       QString mess = "OpenCV cannot process file " + name + " " +
-                      QString::fromStdString(e.what()); 
+                      QString::fromStdString(e.what());
       throw IException(IException::User, mess, _FILEINFO_);
     }
   }
@@ -239,12 +222,12 @@ SurfacePoint ImageSource::getLatLon(const double &line, const double &sample) {
       double lat = m_data->m_projection->UniversalLatitude();
       double lon = m_data->m_projection->UniversalLongitude();
       double radius = m_data->m_projection->LocalRadius(lat);
-      point.SetSphericalCoordinates(Latitude(lat, Angle::Degrees), 
+      point.SetSphericalCoordinates(Latitude(lat, Angle::Degrees),
                                     Longitude(lon, Angle::Degrees),
                                     Distance(radius, Distance::Meters));
     }
   }
-  else if ( hasCamera() ) { 
+  else if ( hasCamera() ) {
     if ( m_data->m_camera->SetImage(sample, line) ) {
       point = m_data->m_camera->GetSurfacePoint();
     }
@@ -281,7 +264,7 @@ bool ImageSource::getLineSamp(const SurfacePoint &point,
     }
   }
   else if ( hasCamera() ) {
-    if ( m_data->m_camera->SetUniversalGround(lat, lon) ) { 
+    if ( m_data->m_camera->SetUniversalGround(lat, lon) ) {
       isGood = true;
       line   = m_data->m_camera->Line();
       samp   = m_data->m_camera->Sample();
@@ -293,7 +276,7 @@ bool ImageSource::getLineSamp(const SurfacePoint &point,
 }
 
 cv::Mat ImageSource::getGeometryMapping(ImageSource &match,
-                                        const int &minpts, 
+                                        const int &minpts,
                                         const double &tol,
                                         const cv::Rect &subarea) {
 
@@ -307,7 +290,7 @@ cv::Mat ImageSource::getGeometryMapping(ImageSource &match,
 
   cv::Rect iSize(0.0f, 0.0f, samples(), lines());
   if ( subarea.area() != 0.0 ) {  iSize = subarea;  }
-  
+
   int nsamps = iSize.width;
   int nlines = iSize.height;
 
@@ -320,7 +303,7 @@ cv::Mat ImageSource::getGeometryMapping(ImageSource &match,
 
   while ( ((int) source.size() < v_minpts) && (!done) ) {
 
-    double sSpacing = qMax(1.0, (double) nsamps / (double)(increment)); 
+    double sSpacing = qMax(1.0, (double) nsamps / (double)(increment));
     double lSpacing = qMax(1.0, (double) nlines / (double) (increment));
     if ( qMax(sSpacing, lSpacing) <= 1 ) done = true;  // Last possible loop
 
@@ -377,7 +360,7 @@ cv::Mat ImageSource::getGeometryMapping(ImageSource &match,
     mapper = cv::findHomography(source, train, CV_RANSAC, tol, inliers);
   }
 
-  return (mapper);  
+  return (mapper);
 }
 
 Histogram *ImageSource::getHistogram(Cube &cube) const {
@@ -405,7 +388,7 @@ bool ImageSource::initGeometry() {
   cube.open(ifile.expanded(), "r");
 
   if( cube.bandCount() != 1 ) {
-    QString msg = "Input cube " + m_data->m_name + 
+    QString msg = "Input cube " + m_data->m_name +
                   " must only have one band!";
    throw IException(IException::User, msg, _FILEINFO_);
   }
@@ -423,9 +406,9 @@ bool ImageSource::initGeometry(Cube &cube) {
   try {
     if ( cube.isProjected() ) {
       int ns, nl;
-      m_data->m_projection =  ((TProjection *) ProjectionFactory::CreateForCube(*cube.label(), ns, nl, true) ); 
+      m_data->m_projection =  ((TProjection *) ProjectionFactory::CreateForCube(*cube.label(), ns, nl, true) );
       gotOne = true;
-    } 
+    }
 
     // Try camera also, independantly
     m_data->m_camera= ( CameraFactory::Create(cube) );
diff --git a/isis/src/control/apps/findfeatures/ImageSource.h b/isis/src/control/apps/findfeatures/ImageSource.h
index 0f9509273d3d70ffe0ecf3a9cbd5c51ed8cb03c0..cc5103e2db67b275e88ad5d2ad695001f5517085 100644
--- a/isis/src/control/apps/findfeatures/ImageSource.h
+++ b/isis/src/control/apps/findfeatures/ImageSource.h
@@ -1,26 +1,13 @@
 #ifndef ImageSource_h
 #define ImageSource_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QList>
 #include <QMutex>
@@ -41,25 +28,25 @@ namespace Isis {
   class Histogram;
 
 /**
- * @brief Provides Image I/O and geometry support for matching purposes 
- *  
- * This class provides I/O and geometry support that is tailored to the ISIS 
- * environment but not limited to it.  It will also read any format supported by 
- * the OpenCV image interfaces. 
- *  
- * @author 2014-07-01 Kris Becker 
- * @internal 
- *   @history 2014-07-01 Kris Becker - Original Version 
- *   @history 2016-02-08 Kris Becker - Changed call to ISIS Histogram class for 
+ * @brief Provides Image I/O and geometry support for matching purposes
+ *
+ * This class provides I/O and geometry support that is tailored to the ISIS
+ * environment but not limited to it.  It will also read any format supported by
+ * the OpenCV image interfaces.
+ *
+ * @author 2014-07-01 Kris Becker
+ * @internal
+ *   @history 2014-07-01 Kris Becker - Original Version
+ *   @history 2016-02-08 Kris Becker - Changed call to ISIS Histogram class for
  *                           recent changes
  */
 
 class ImageSource {
   public:
     ImageSource();
-    ImageSource(const QString &name, 
-                const bool geometryOnly = false, 
-                const double minPercent = 0.5, 
+    ImageSource(const QString &name,
+                const bool geometryOnly = false,
+                const double minPercent = 0.5,
                 const double maxPercent = 99.5);
     explicit ImageSource(const QString &name, const cv::Mat &image,
                          const QString &identifier = "");
@@ -67,9 +54,9 @@ class ImageSource {
 
     virtual ~ImageSource() { }
 
-    void load(const double minPercent = 0.5,const double maxPercent = 99.5); 
+    void load(const double minPercent = 0.5,const double maxPercent = 99.5);
     void load(const QString &name, const double minPercent = 0.5,
-              const double maxPercent = 99.5); 
+              const double maxPercent = 99.5);
 
     inline QString name() const {  return ( m_data->m_name );  }
     inline QString serialno() const { return (  m_data->m_serialno ); }
@@ -88,44 +75,44 @@ class ImageSource {
     SurfacePoint getLatLon(const double &line, const double &sample);
     bool getLineSamp(const SurfacePoint &point,
                      double &line, double &samp, double &radius);
-    cv::Mat getGeometryMapping(ImageSource &match, const int &minpts = 25, 
+    cv::Mat getGeometryMapping(ImageSource &match, const int &minpts = 25,
                                const double &tol = 3.0,
                                const cv::Rect &subarea = cv::Rect());
 
 
 
   private:
-    /** 
+    /**
      *  Shared Image data pointer
-     *  
-     * @author 2014-07-01 Kris Becker 
-     * @internal 
-     *   @history 2014-07-01 Kris Becker - Original Version 
+     *
+     * @author 2014-07-01 Kris Becker
+     * @internal
+     *   @history 2014-07-01 Kris Becker - Original Version
      */
     class SourceData : public QSharedData {
       public:
         SourceData() : m_name("Image"), m_serialno("none"), m_projection(0),
                        m_camera(0), m_image(), m_mutex(new QMutex()) { }
-        SourceData(const QString &name) : m_name(name), m_serialno("none"), 
-                                          m_projection(0),m_camera(0), 
+        SourceData(const QString &name) : m_name(name), m_serialno("none"),
+                                          m_projection(0),m_camera(0),
                                           m_image(), m_mutex(new QMutex()) { }
-        SourceData(const QString &name, const cv::Mat &image, 
+        SourceData(const QString &name, const cv::Mat &image,
                    const QString &serialno) : m_name(name), m_serialno(serialno),
-                                              m_projection(0), m_camera(0), 
+                                              m_projection(0), m_camera(0),
                                               m_image(image), m_mutex(new QMutex()) { }
         SourceData(const QString &name, const QString &serialno,
-                   TProjection *proj, Camera *camera, const cv::Mat &image) : 
+                   TProjection *proj, Camera *camera, const cv::Mat &image) :
                    m_name(name), m_serialno(serialno),
-                   m_projection(proj), m_camera(camera), 
+                   m_projection(proj), m_camera(camera),
                    m_image(image), m_mutex(new QMutex()) { }
-        SourceData(const SourceData &other) : QSharedData(other), 
+        SourceData(const SourceData &other) : QSharedData(other),
                                               m_name(other.m_name),
                                               m_serialno(other.m_serialno),
                                               m_projection(0),
-                                              m_camera(0), 
-                                              m_image(), 
+                                              m_camera(0),
+                                              m_image(),
                                               m_mutex( new QMutex() ) { }
-                                               
+
         ~SourceData() {
           delete m_projection;
           delete m_camera;
@@ -150,7 +137,7 @@ class ImageSource {
 
     bool initGeometry();
     bool initGeometry(Cube &cube);
-    
+
 };
 
 
diff --git a/isis/src/control/apps/findfeatures/ImageTransform.cpp b/isis/src/control/apps/findfeatures/ImageTransform.cpp
index d1e0706f8f08ddb104d747e54f6b1f94f94e25ca..0ed1ef844be3f1f116c5173e5a89fcf7b5caf7a2 100644
--- a/isis/src/control/apps/findfeatures/ImageTransform.cpp
+++ b/isis/src/control/apps/findfeatures/ImageTransform.cpp
@@ -1,27 +1,10 @@
-/**                                                                       
- * @file                                                                  
- * $Revision$
- * $Date$
- * $Id$
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */ 
+/** This is free and unencumbered software released into the public domain.
 
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -44,8 +27,8 @@ ImageTransform::ImageTransform(const QString &name) : m_name(name) { }
 
 ImageTransform::~ImageTransform() { }
 
-QString ImageTransform::name() const {  
-  return ( m_name );  
+QString ImageTransform::name() const {
+  return ( m_name );
 }
 
 
@@ -53,11 +36,11 @@ QString ImageTransform::name() const {
  * Perform the transformation on an image matrix.
  * Child classes should override this method with to implement transformation
  * process.
- * 
+ *
  * @param image The input image data matrix to transform.
- * 
+ *
  * @return @b cv::Mat The transformed matrix.
- * 
+ *
  * @note The cv::Mat class implicilty shares, so if the input image matrix, or
  *       a copy of it, will be modified you need to clone() the matrix prior
  *       to modification or the input matrix will be changed.
@@ -74,7 +57,7 @@ cv::Point2f ImageTransform::inverse(const cv::Point2f &point) const {
 }
 
 
-ImageTransform::RectArea ImageTransform::boundingBox(const cv::Mat &tform, 
+ImageTransform::RectArea ImageTransform::boundingBox(const cv::Mat &tform,
                                        const ImageTransform::RectArea &region,
                                        const cv::Size &bounds) {
 
@@ -83,13 +66,13 @@ ImageTransform::RectArea ImageTransform::boundingBox(const cv::Mat &tform,
   cv::perspectiveTransform(b_corners, t_corners, tform);
 
   float xmin(t_corners[0].x), xmax(t_corners[0].x);
-  float ymin(t_corners[0].y), ymax(t_corners[0].y); 
+  float ymin(t_corners[0].y), ymax(t_corners[0].y);
   for (unsigned int i = 0 ; i < t_corners.size() ; i++) {
 #if 0
-    std::cout << "(x,y) -> (x',y') = (" 
-              << b_corners[i].x << "," << b_corners[i].y << ") -> (" 
+    std::cout << "(x,y) -> (x',y') = ("
+              << b_corners[i].x << "," << b_corners[i].y << ") -> ("
               << t_corners[i].x << "," << t_corners[i].y << ")\n";
-#endif         
+#endif
    if ( t_corners[i].x < xmin) xmin = t_corners[i].x;
     if ( t_corners[i].x > xmax) xmax = t_corners[i].x;
     if ( t_corners[i].y < ymin) ymin = t_corners[i].y;
@@ -97,23 +80,23 @@ ImageTransform::RectArea ImageTransform::boundingBox(const cv::Mat &tform,
   }
 
   cv::Point2f xymin( qMax(0.0f, xmin), qMax(0.0f, ymin) );
-  cv::Point2f xymax( qMin(xmax, bounds.width-1.0f), 
-                     qMin(ymax, bounds.height-1.0f) ); 
-  cv::Rect bbox( xymin.x , xymin.y, 
-                 (int) (xymax.x-xymin.x+0.5), 
+  cv::Point2f xymax( qMin(xmax, bounds.width-1.0f),
+                     qMin(ymax, bounds.height-1.0f) );
+  cv::Rect bbox( xymin.x , xymin.y,
+                 (int) (xymax.x-xymin.x+0.5),
                  (int) (xymax.y-xymin.y+0.5) );
   return ( bbox );
 }
 
-ImageTransform::RectArea ImageTransform::transformedSize(const cv::Mat &tmat, 
-                                                        const cv::Size &imSize, 
+ImageTransform::RectArea ImageTransform::transformedSize(const cv::Mat &tmat,
+                                                        const cv::Size &imSize,
                                                         cv::Mat &tmat_t) {
 
   std::vector<cv::Point2f> t_corners;
   cv::perspectiveTransform(corners(imSize), t_corners, tmat);
 
   double xmin(t_corners[0].x), xmax(t_corners[0].x);
-  double ymin(t_corners[0].y), ymax(t_corners[0].y); 
+  double ymin(t_corners[0].y), ymax(t_corners[0].y);
   for (unsigned int i = 1 ; i < t_corners.size() ; i++) {
     if ( t_corners[i].x < xmin) xmin = t_corners[i].x;
     if ( t_corners[i].x > xmax) xmax = t_corners[i].x;
@@ -122,7 +105,7 @@ ImageTransform::RectArea ImageTransform::transformedSize(const cv::Mat &tmat,
   }
 
 #if 0
-  std::cout << "\nImageSize:    " << imSize.width << ", " << imSize.height << "\n"; 
+  std::cout << "\nImageSize:    " << imSize.width << ", " << imSize.height << "\n";
   std::cout << "Min x,y:      " << xmin << ", " << ymin << "\n";
   std::cout << "NewImageSize: " << (xmax-xmin) << ", " << (ymax-ymin) << "\n";
 #endif
@@ -130,7 +113,7 @@ ImageTransform::RectArea ImageTransform::transformedSize(const cv::Mat &tmat,
   // Compute translation to orient the image at line 0.
   cv::Mat zMap = translation(-xmin, -ymin);
   tmat_t = zMap * tmat;
-  return ( RectArea(xmin, ymin, (int) (xmax-xmin+0.5), (int) (ymax-ymin+0.5)) ); 
+  return ( RectArea(xmin, ymin, (int) (xmax-xmin+0.5), (int) (ymax-ymin+0.5)) );
 }
 
 std::vector<cv::Point2f> ImageTransform::corners(const cv::Size &imSize) {
@@ -146,8 +129,8 @@ std::vector<cv::Point2f> ImageTransform::corners(const ImageTransform::RectArea
   std::vector<cv::Point2f> points;
   points.push_back(cv::Point2f(region.x, region.y) );
   points.push_back(cv::Point2f(region.x + region.width - 1.0, region.y));
-  points.push_back(cv::Point2f(region.x + region.width - 1.0, 
-                               region.y + region.height - 1.0)); 
+  points.push_back(cv::Point2f(region.x + region.width - 1.0,
+                               region.y + region.height - 1.0));
   points.push_back(cv::Point2f(region.x, region.y + region.height - 1.0));
   return ( points );
 }
diff --git a/isis/src/control/apps/findfeatures/ImageTransform.h b/isis/src/control/apps/findfeatures/ImageTransform.h
index 51af04ef9e3bd29635c338fa1ba7f5950903af20..9877a87f062bc7affe172244198a1b7de2a62ec5 100644
--- a/isis/src/control/apps/findfeatures/ImageTransform.h
+++ b/isis/src/control/apps/findfeatures/ImageTransform.h
@@ -1,26 +1,13 @@
 #ifndef ImageTransform_h
 #define ImageTransform_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QList>
 #include <QString>
@@ -34,10 +21,10 @@ namespace Isis {
 
 /**
  * @brief OpenCV-based image transformation base class
- *  
- *  
- * @author 2014-07-01 Kris Becker 
- * @internal 
+ *
+ *
+ * @author 2014-07-01 Kris Becker
+ * @internal
  *   @history 2014-07-01 Kris Becker - Original Version
  *   @history 2017-06-22 Jesse Mapel - Added a warning to render about
  *                                     cv::Mat copying and modification.
@@ -60,11 +47,11 @@ class ImageTransform {
     virtual cv::Point2f inverse(const cv::Point2f &point) const;
 
 
-    static RectArea boundingBox(const cv::Mat &tform, 
+    static RectArea boundingBox(const cv::Mat &tform,
                                 const RectArea &region,
                                 const cv::Size &bounds);
-    static RectArea transformedSize(const cv::Mat &tmat, 
-                                    const cv::Size &imSize, 
+    static RectArea transformedSize(const cv::Mat &tmat,
+                                    const cv::Size &imSize,
                                     cv::Mat &tmat_t);
 
     static std::vector<cv::Point2f> corners(const cv::Size &imSize);
@@ -77,7 +64,7 @@ class ImageTransform {
     QString          m_name;
 };
 
-///!<   Shared ImageTransformpointer that everyone can use 
+///!<   Shared ImageTransformpointer that everyone can use
 typedef QSharedPointer<ImageTransform> SharedImageTransform;
 
 ///!<  Define a ImageTransform list
diff --git a/isis/src/control/apps/findfeatures/KAZEAlgorithm.cpp b/isis/src/control/apps/findfeatures/KAZEAlgorithm.cpp
index cf03ab8e521586dcf5882ea6a799c725c0674d61..fc2d9393a7f521f3a1a84b7eed12fd2e90f6a6dd 100644
--- a/isis/src/control/apps/findfeatures/KAZEAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/KAZEAlgorithm.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "KAZEAlgorithm.h"
 #include <QVariant>
@@ -29,9 +15,9 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  KAZEAlgorithm::KAZEAlgorithm() : 
+  KAZEAlgorithm::KAZEAlgorithm() :
                  Feature2DAlgorithm("KAZE", "Feature2D",
-                                    KAZEType::create()) {  
+                                    KAZEType::create()) {
     setupTypeMap();
     m_variables.merge( getAlgorithmVariables() );
   }
@@ -39,13 +25,13 @@ namespace Isis {
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   KAZEAlgorithm::KAZEAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                  Feature2DAlgorithm("KAZE", "Feature2D", 
+                  Feature2DAlgorithm("KAZE", "Feature2D",
                                      KAZEType::create(), cvars) {
     setupTypeMap();
     setConfig(config);
@@ -62,7 +48,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString KAZEAlgorithm::description() const {
@@ -86,7 +72,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -97,38 +83,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool KAZEAlgorithm::hasDetector() const { 
-    return true; 
+  bool KAZEAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool KAZEAlgorithm::hasExtractor() const { 
-    return true; 
+  bool KAZEAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool KAZEAlgorithm::hasMatcher() const { 
-    return false; 
+  bool KAZEAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap KAZEAlgorithm::getAlgorithmVariables( ) const {
@@ -146,38 +132,38 @@ namespace Isis {
 
 /**
  * Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Number of variables actually set
- * 
+ *
  * @throws IException::User "The input value is not valid for KAZE's [Type] variable"
  */
   int KAZEAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) {
     KAZEPtr algorithm = m_algorithm.dynamicCast<KAZEType>();
 
     int numSet(0);
-    if ( variables.exists("Extended") ) { 
+    if ( variables.exists("Extended") ) {
       algorithm->setExtended(toInt(variables.get("Extended")));
       numSet++;
     }
 
-    if ( variables.exists("Threshold") ) { 
+    if ( variables.exists("Threshold") ) {
       algorithm->setThreshold(toInt(variables.get("Threshold")));
       numSet++;
     }
 
-    if ( variables.exists("NOctaveLayers") ) { 
+    if ( variables.exists("NOctaveLayers") ) {
       algorithm->setNOctaveLayers(toInt(variables.get("NOctaveLayers")));
       numSet++;
     }
 
-    if ( variables.exists("NOctaves") ) { 
+    if ( variables.exists("NOctaves") ) {
       algorithm->setNOctaves(toInt(variables.get("NOctaves")));
       numSet++;
     }
 
-    if ( variables.exists("Upright") ) { 
+    if ( variables.exists("Upright") ) {
       algorithm->setUpright(toInt(variables.get("Upright")));
       numSet++;
     }
diff --git a/isis/src/control/apps/findfeatures/KAZEAlgorithm.h b/isis/src/control/apps/findfeatures/KAZEAlgorithm.h
index 4dabc98ae9f84ed0cc75fe3c8c1224dbebef08ea..f6b64a361d2f2a60f4d8a712a59626b31011663a 100644
--- a/isis/src/control/apps/findfeatures/KAZEAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/KAZEAlgorithm.h
@@ -1,27 +1,13 @@
 #ifndef KAZEAlgorithm_h
 #define KAZEAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/features2d.hpp"
@@ -35,15 +21,15 @@
 namespace Isis {
 
 /**
- * @brief KAZE Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 KAZE Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief KAZE Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 KAZE Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-09 Kristin Berry
- *  
- * @internal 
- *   @history 2016-12-09 Kristin Berry - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-09 Kristin Berry - Original Version
  */
 
 class KAZEAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/LATCHAlgorithm.cpp b/isis/src/control/apps/findfeatures/LATCHAlgorithm.cpp
index 3c278568dcc2383e6cf3685c4dac53b90afdeefb..10e0c62aff59874f168795fa69b35aa02f2203a7 100644
--- a/isis/src/control/apps/findfeatures/LATCHAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/LATCHAlgorithm.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,9 +19,9 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  LATCHAlgorithm::LATCHAlgorithm() : 
+  LATCHAlgorithm::LATCHAlgorithm() :
                  Feature2DAlgorithm("LATCH", "Feature2D",
-                                    LATCHType::create()) {  
+                                    LATCHType::create()) {
 
     setupParameters();
   }
@@ -43,15 +29,15 @@ namespace Isis {
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
-  LATCHAlgorithm::LATCHAlgorithm(const PvlFlatMap &cvars, const QString &config) : 
-                  Feature2DAlgorithm("LATCH", "Feature2D", 
+  LATCHAlgorithm::LATCHAlgorithm(const PvlFlatMap &cvars, const QString &config) :
+                  Feature2DAlgorithm("LATCH", "Feature2D",
                                      LATCHType::create(), cvars) {
-    setConfig(config);    
+    setConfig(config);
     PvlFlatMap variables = setupParameters();
     variables.merge(cvars);
     const int bytes = toInt(variables.get("Bytes"));
@@ -71,9 +57,9 @@ namespace Isis {
 
 
   /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap LATCHAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -87,7 +73,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString LATCHAlgorithm::description() const {
@@ -100,7 +86,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -111,38 +97,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool LATCHAlgorithm::hasDetector() const { 
-    return false; 
+  bool LATCHAlgorithm::hasDetector() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool LATCHAlgorithm::hasExtractor() const { 
-    return true; 
+  bool LATCHAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool LATCHAlgorithm::hasMatcher() const { 
-    return false; 
+  bool LATCHAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap LATCHAlgorithm::getAlgorithmVariables( ) const {
@@ -152,11 +138,11 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Always -1, variables cannot be set after initialization.
- * 
+ *
  * @throws IException::Programmer "LATCHAlgorithm does not have the ability
  *                                 to set algorithm parameters."
  */
diff --git a/isis/src/control/apps/findfeatures/LATCHAlgorithm.h b/isis/src/control/apps/findfeatures/LATCHAlgorithm.h
index 86602cea15ef2a7fb91b76df1cce68f949d289f0..2c308b43ab02ba7dd6568be6c44abdfd92cd5f2a 100644
--- a/isis/src/control/apps/findfeatures/LATCHAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/LATCHAlgorithm.h
@@ -1,26 +1,13 @@
 #ifndef LATCHAlgorithm_h
 #define LATCHAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/xfeatures2d.hpp"
@@ -30,15 +17,15 @@
 namespace Isis {
 
 /**
- * @brief LATCH Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 LATCH Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief LATCH Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 LATCH Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-12 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-12 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-12 Jesse Mapel - Original Version
  */
 
 class LATCHAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/LUCIDAlgorithm.cpp b/isis/src/control/apps/findfeatures/LUCIDAlgorithm.cpp
index 6ef700cd740362b61dda8d455fce88cbadad921f..d8f5ce604624f1b534868822d74e7e1790137d5a 100644
--- a/isis/src/control/apps/findfeatures/LUCIDAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/LUCIDAlgorithm.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,32 +19,32 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  LUCIDAlgorithm::LUCIDAlgorithm() : 
+  LUCIDAlgorithm::LUCIDAlgorithm() :
                   Feature2DAlgorithm( "LUCID", "Feature2D",
-                                     LUCIDType::create(1,1) ) {  
+                                     LUCIDType::create(1,1) ) {
     setupParameters();
   }
 
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   LUCIDAlgorithm::LUCIDAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                  Feature2DAlgorithm("LUCID", "Feature2D", 
+                  Feature2DAlgorithm("LUCID", "Feature2D",
                                      LUCIDType::create(1,1), cvars) {
     setConfig(config);
     PvlFlatMap variables = setupParameters();
     variables.merge(cvars);
     const int lucidKernel = toInt(variables.get("LucidKernel"));
     const int blurKernel = toInt(variables.get("BlurKernel"));
-   
+
     m_algorithm = LUCIDType::create(lucidKernel, blurKernel);
 
-    m_variables.merge(variables); 
+    m_variables.merge(variables);
   }
 
 
@@ -69,9 +55,9 @@ namespace Isis {
 
 
   /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap LUCIDAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -84,7 +70,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString LUCIDAlgorithm::description() const {
@@ -97,7 +83,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -108,38 +94,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool LUCIDAlgorithm::hasDetector() const { 
-    return false; 
+  bool LUCIDAlgorithm::hasDetector() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool LUCIDAlgorithm::hasExtractor() const { 
-    return true; 
+  bool LUCIDAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool LUCIDAlgorithm::hasMatcher() const { 
-    return false; 
+  bool LUCIDAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap LUCIDAlgorithm::getAlgorithmVariables( ) const {
@@ -149,11 +135,11 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Always -1, variables cannot be set after initialization.
- * 
+ *
  * @throws IException::Programmer "LUCIDAlgorithm does not have the ability
  *                                 to set algorithm parameters."
  */
diff --git a/isis/src/control/apps/findfeatures/LUCIDAlgorithm.h b/isis/src/control/apps/findfeatures/LUCIDAlgorithm.h
index 6a8afc876a7a3f5f30398178eb9f4c9d8edd4fad..09d6fd33de43255b705ddf00ebb2e27bc5d0a192 100644
--- a/isis/src/control/apps/findfeatures/LUCIDAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/LUCIDAlgorithm.h
@@ -1,26 +1,12 @@
 #ifndef LUCIDAlgorithm_h
 #define LUCIDAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FeatureAlgorithm.h"
 #include <QVariant>
@@ -28,15 +14,15 @@
 namespace Isis {
 
 /**
- * @brief LUCID Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 LUCID Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief LUCID Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 LUCID Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-12 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-12 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-12 Jesse Mapel - Original Version
  */
 
 class LUCIDAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/MSDAlgorithm.cpp b/isis/src/control/apps/findfeatures/MSDAlgorithm.cpp
index af037a1c3c70e641161615b436f6967c788ac98e..2e6949b95d7aa0d5277d065daf91ce920ee112c3 100644
--- a/isis/src/control/apps/findfeatures/MSDAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/MSDAlgorithm.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,9 +19,9 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  MSDAlgorithm::MSDAlgorithm() : 
+  MSDAlgorithm::MSDAlgorithm() :
                  Feature2DAlgorithm("MSD", "Feature2D",
-                                    MSDType::create()) {  
+                                    MSDType::create()) {
     setupParameters();
 
   }
@@ -43,13 +29,13 @@ namespace Isis {
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   MSDAlgorithm::MSDAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                Feature2DAlgorithm("MSD", "Feature2D", 
+                Feature2DAlgorithm("MSD", "Feature2D",
                                     MSDType::create(), cvars) {
     setConfig(config);
     PvlFlatMap variables = setupParameters();
@@ -64,9 +50,9 @@ namespace Isis {
     const int nScales = toInt(variables.get("NScales"));
     const bool computeOrientation = toBool(variables.get("ComputeOrientation"));
 
-    m_algorithm = MSDType::create(patchRadius, searchAreaRadius, nmsRadius, nmsScaleRadius, 
+    m_algorithm = MSDType::create(patchRadius, searchAreaRadius, nmsRadius, nmsScaleRadius,
                                   thSaliency, kNN, scaleFactor, nScales, computeOrientation);
-                                  
+
     m_variables.merge(variables);
   }
 
@@ -78,9 +64,9 @@ namespace Isis {
 
 
   /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap MSDAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -100,7 +86,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString MSDAlgorithm::description() const {
@@ -113,7 +99,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -125,38 +111,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool MSDAlgorithm::hasDetector() const { 
-    return true; 
+  bool MSDAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool MSDAlgorithm::hasExtractor() const { 
-    return false; 
+  bool MSDAlgorithm::hasExtractor() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool MSDAlgorithm::hasMatcher() const { 
-    return false; 
+  bool MSDAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap MSDAlgorithm::getAlgorithmVariables( ) const {
@@ -166,11 +152,11 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Always -1, variables cannot be set after initialization.
- * 
+ *
  * @throws IException::Programmer "MSDAlgorithm does not have the ability
  *                                 to set algorithm parameters."
  */
diff --git a/isis/src/control/apps/findfeatures/MSDAlgorithm.h b/isis/src/control/apps/findfeatures/MSDAlgorithm.h
index 7cf9fc794eaa492ad1215342600385dbfe8952a8..81c03fbafff6089f281d1771a0879e5f303336f1 100644
--- a/isis/src/control/apps/findfeatures/MSDAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/MSDAlgorithm.h
@@ -1,26 +1,13 @@
 #ifndef MSDAlgorithm_h
 #define MSDAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/xfeatures2d.hpp"
@@ -30,15 +17,15 @@
 namespace Isis {
 
 /**
- * @brief MSD Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 MSDDetector Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief MSD Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 MSDDetector Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-12 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-12 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-12 Jesse Mapel - Original Version
  */
 
 class MSDAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
@@ -46,7 +33,7 @@ class MSDAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
   public:
     MSDAlgorithm();
     MSDAlgorithm( const PvlFlatMap &cvars, const QString &config = QString() );
-                 
+
     virtual ~MSDAlgorithm();
 
     QString description() const;
@@ -59,7 +46,7 @@ class MSDAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
     virtual bool hasExtractor() const;
     virtual bool hasMatcher() const;
 
-  protected:    
+  protected:
     virtual PvlFlatMap setupParameters();
     virtual PvlFlatMap getAlgorithmVariables() const;
     virtual int setAlgorithmVariables(const PvlFlatMap &variables);
diff --git a/isis/src/control/apps/findfeatures/MSERAlgorithm.cpp b/isis/src/control/apps/findfeatures/MSERAlgorithm.cpp
index db0ee82e4267f9a5799fa8a82dd90604b7bdb9e1..c098900b0fedd574d57019220395785b27da76c2 100644
--- a/isis/src/control/apps/findfeatures/MSERAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/MSERAlgorithm.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,22 +19,22 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  MSERAlgorithm::MSERAlgorithm() : 
+  MSERAlgorithm::MSERAlgorithm() :
                  Feature2DAlgorithm("MSER", "Feature2D",
-                                    MSERType::create()) {  
+                                    MSERType::create()) {
     setupParameters();
   }
 
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   MSERAlgorithm::MSERAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                 Feature2DAlgorithm("MSER", "Feature2D", 
+                 Feature2DAlgorithm("MSER", "Feature2D",
                                     MSERType::create(), cvars) {
     setConfig(config);
     PvlFlatMap variables = setupParameters();
@@ -77,9 +63,9 @@ namespace Isis {
 
 
   /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap MSERAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -88,7 +74,7 @@ namespace Isis {
     variables.add("MaxArea",       "14400");
     variables.add("MaxVariation",  "0.25");
     variables.add("MinDiversity",  "0.2");
-    variables.add("MaxEvolution",  "200"); 
+    variables.add("MaxEvolution",  "200");
     variables.add("AreaThreshold", "1.01");
     variables.add("MinMargin",     "0.003");
     variables.add("EdgeBlurSize",  "5");
@@ -99,7 +85,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString MSERAlgorithm::description() const {
@@ -112,7 +98,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -123,9 +109,9 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
   bool MSERAlgorithm::hasDetector() const {
     return true;
@@ -133,9 +119,9 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
   bool MSERAlgorithm::hasExtractor() const {
     return false;
@@ -143,9 +129,9 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
   bool MSERAlgorithm::hasMatcher() const {
     return false;
@@ -154,7 +140,7 @@ namespace Isis {
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap MSERAlgorithm::getAlgorithmVariables( ) const {
@@ -164,11 +150,11 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Always -1, variables cannot be set after initialization.
- * 
+ *
  * @throws IException::Programmer "BriefDescriptorAlgorithm does not have the ability
  *                                 to set algorithm parameters."
  */
diff --git a/isis/src/control/apps/findfeatures/MSERAlgorithm.h b/isis/src/control/apps/findfeatures/MSERAlgorithm.h
index 4f9ba3aef1b923e6a1598c28913401e72829760e..3621913c0220df88379e554cf9f1a798aea64005 100644
--- a/isis/src/control/apps/findfeatures/MSERAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/MSERAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef MSERAlgorithm_h
 #define MSERAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "opencv2/features2d.hpp"
 
@@ -32,15 +20,15 @@
 namespace Isis {
 
 /**
- * @brief MSER Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 MSER Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief MSER Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 MSER Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-08 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-08 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-08 Jesse Mapel - Original Version
  */
 
 class MSERAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/MSERExtractor.cpp b/isis/src/control/apps/findfeatures/MSERExtractor.cpp
index 0b2a3bcfb3d1d812d45485bb232ebf5a37bc22f7..0df2ea05b9e209f938de0a504c7b249b43e377f7 100644
--- a/isis/src/control/apps/findfeatures/MSERExtractor.cpp
+++ b/isis/src/control/apps/findfeatures/MSERExtractor.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MSERExtractor.h"
 #include "IException.h"
 
@@ -5,132 +13,132 @@
 
 namespace Isis {
 
-  /** 
-   * Always throws an exception. 
-   * 
+  /**
+   * Always throws an exception.
+   *
    * @param image input image
    * @param msers resulting list of point sets
    * @param bboxes bounding boxes
-   *  
-   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER 
-   *                                 algorithm." 
+   *
+   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER
+   *                                 algorithm."
    */
   void MSERExtractor::detectRegions (cv::InputArray image,
                                      std::vector< std::vector< cv::Point > > &msers,
                                      std::vector< cv::Rect > &bboxes)  {
     QString mess = "ISIS does not support this method for the OpenCV MSER algorithm.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
   /**
-   * Always throws an exception. 
-   *  
+   * Always throws an exception.
+   *
    * @return int (-1)
-   *  
-   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER 
-   *                                 algorithm." 
+   *
+   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER
+   *                                 algorithm."
    */
   int MSERExtractor::getDelta () const {
     QString mess = "ISIS does not support this method for the OpenCV MSER algorithm.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
   /**
-   * Always throws an exception.  
-   *  
+   * Always throws an exception.
+   *
    * @return int (-1)
-   *  
-   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER 
-   *                                algorithm." 
+   *
+   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER
+   *                                algorithm."
    */
   int MSERExtractor::getMaxArea () const {
     QString mess = "ISIS does not support this method for the OpenCV MSER algorithm.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
   /**
-   * Always throws an exception.  
-   *   
+   * Always throws an exception.
+   *
    * @return int (-1)
-   *  
-   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER 
-   *                                 algorithm." 
+   *
+   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER
+   *                                 algorithm."
    */
   int MSERExtractor::getMinArea () const {
     QString mess = "ISIS does not support this method for the OpenCV MSER algorithm.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
   /**
-   * Always throws an exception.  
-   * 
+   * Always throws an exception.
+   *
    * @return bool false
-   *  
-   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER 
-   *                                 algorithm." 
+   *
+   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER
+   *                                 algorithm."
    */
   bool MSERExtractor::getPass2Only () const {
     QString mess = "ISIS does not support this method for the OpenCV MSER algorithm.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
   /**
-   * Always throws an exception.  
-   * 
+   * Always throws an exception.
+   *
    * @param delta input delta to set
-   *  
+   *
    * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER
    *                                 algorithm."
    */
   void MSERExtractor::setDelta (int delta) {
     QString mess = "ISIS does not support this method for the OpenCV MSER algorithm.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
   /**
-   * Always throws an exception.  
-   * 
+   * Always throws an exception.
+   *
    * @param maxArea input maximum area
-   *  
-   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER 
-   *                                 algorithm." 
+   *
+   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER
+   *                                 algorithm."
    */
   void MSERExtractor::setMaxArea (int maxArea) {
     QString mess = "ISIS does not support this method for the OpenCV MSER algorithm.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
   /**
-   * Always throws an exception.  
-   *    
+   * Always throws an exception.
+   *
    * @param minArea input minimum area
-   *  
-   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER 
-   *                                 algorithm." 
+   *
+   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER
+   *                                 algorithm."
    */
   void MSERExtractor::setMinArea (int minArea) {
     QString mess = "ISIS does not support this method for the OpenCV MSER algorithm.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 
 
   /**
-   * Always throws an exception.   
-   *  
-   * @param f input value 
-   *  
-   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER 
-   *                                 algorithm."   
+   * Always throws an exception.
+   *
+   * @param f input value
+   *
+   * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER
+   *                                 algorithm."
    */
   void MSERExtractor::setPass2Only (bool f) {
     QString mess = "ISIS does not support this method for the OpenCV MSER algorithm.";
-    throw IException(IException::Programmer, mess, _FILEINFO_); 
+    throw IException(IException::Programmer, mess, _FILEINFO_);
   }
 };
diff --git a/isis/src/control/apps/findfeatures/MSERExtractor.h b/isis/src/control/apps/findfeatures/MSERExtractor.h
index d1311005790da29eaf5ba40992175d8f8c1bec8c..9e3d44ac7593b60fbd0c473e9ec6e92cbde12d82 100644
--- a/isis/src/control/apps/findfeatures/MSERExtractor.h
+++ b/isis/src/control/apps/findfeatures/MSERExtractor.h
@@ -1,22 +1,30 @@
 #ifndef MSERExtractor_h
 #define MSERExtractor_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "opencv2/xfeatures2d.hpp"
 #include "opencv2/opencv.hpp"
 
 namespace Isis {
 
 /**
- * Wrap of OpenCV3 MSER algorithm to implement pure virtual functions. 
- *  
- * @author 2016-12-20 Jesse Mapel 
- *  
- * @internal 
+ * Wrap of OpenCV3 MSER algorithm to implement pure virtual functions.
+ *
+ * @author 2016-12-20 Jesse Mapel
+ *
+ * @internal
  *  @history 2016-12-20 Jesse Mapel - Original Version
  *  @history 2016-12-27 Kristin Berry - Added documentation
  */
 
-class MSERExtractor : public cv::MSER {  
+class MSERExtractor : public cv::MSER {
 
 public:
   virtual void detectRegions (cv::InputArray image,
diff --git a/isis/src/control/apps/findfeatures/MatchImage.h b/isis/src/control/apps/findfeatures/MatchImage.h
index 63d28983c782f96b9b4b231336a860db6610def3..bb745047101d9252397c467aaa5780b9ebe8923d 100644
--- a/isis/src/control/apps/findfeatures/MatchImage.h
+++ b/isis/src/control/apps/findfeatures/MatchImage.h
@@ -1,26 +1,14 @@
 #ifndef MatchImage_h
 #define MatchImage_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QString>
 #include <QSharedPointer>
@@ -38,19 +26,19 @@ namespace Isis {
 
 /**
  * @brief Container for match image data
- *  
- * This class provides storage and computational conversion from original 
- * source image to transformed image. The transformed image takes the original 
- * source image and applies any image transformations to render the image that 
- * is to used in the matcher. 
- *  
- * Its internal data storage is explicitly shared so the object can be copied 
- * freely. When a new image is set, the match data is cleared including the 
+ *
+ * This class provides storage and computational conversion from original
+ * source image to transformed image. The transformed image takes the original
+ * source image and applies any image transformations to render the image that
+ * is to used in the matcher.
+ *
+ * Its internal data storage is explicitly shared so the object can be copied
+ * freely. When a new image is set, the match data is cleared including the
  * transforms for clean match rendering.
- *  
- * @author 2015-10-03 Kris Becker 
- * @internal 
- *   @history 2015-10-03 Kris Becker - Original Version 
+ *
+ * @author 2015-10-03 Kris Becker
+ * @internal
+ *   @history 2015-10-03 Kris Becker - Original Version
  */
 
 class MatchImage {
@@ -62,8 +50,8 @@ class MatchImage {
       m_data->m_source = source;
     }
 
-    MatchImage(const ImageSource &source, 
-               const Keypoints &keypoints, 
+    MatchImage(const ImageSource &source,
+               const Keypoints &keypoints,
                const Descriptors &descriptor,
                const double &ptime = 0.0)  {
       m_data = new ImageData();
@@ -172,23 +160,23 @@ class MatchImage {
     }
 
   private:
-    /** 
+    /**
      *  Shared Image data pointer
-     *  
-     * @author 2015-10-03 Kris Becker 
-     * @internal 
-     *   @history 2015-10-03 Kris Becker - Original Version 
+     *
+     * @author 2015-10-03 Kris Becker
+     * @internal
+     *   @history 2015-10-03 Kris Becker - Original Version
      */
     class ImageData : public QSharedData {
       public:
         ImageData() : m_source(), m_transforms(),
-                      m_keypoints(), m_descriptors(), 
+                      m_keypoints(), m_descriptors(),
                       m_duration(0) { }
         ImageData(const ImageData &other) : QSharedData(other),
-                                            m_source(other.m_source), 
-                                            m_transforms(other.m_transforms), 
-                                            m_keypoints(), 
-                                            m_descriptors(), 
+                                            m_source(other.m_source),
+                                            m_transforms(other.m_transforms),
+                                            m_keypoints(),
+                                            m_descriptors(),
                                             m_duration(0) { }
         ~ImageData() { }
 
@@ -197,7 +185,7 @@ class MatchImage {
         }
 
         // Data....
-        ImageSource  m_source; 
+        ImageSource  m_source;
         Transformer  m_transforms;
         Keypoints    m_keypoints;
         Descriptors  m_descriptors;
diff --git a/isis/src/control/apps/findfeatures/MatchMaker.cpp b/isis/src/control/apps/findfeatures/MatchMaker.cpp
index cb2aeed4afaca5fe2a922450cac237684187fe77..d27e3f662692ea3cc62894512fa68a8ec40669e9 100644
--- a/isis/src/control/apps/findfeatures/MatchMaker.cpp
+++ b/isis/src/control/apps/findfeatures/MatchMaker.cpp
@@ -1,27 +1,10 @@
-/**
- * @file
- * $Revision$
- * $Date$
- * $Id$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
 
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
diff --git a/isis/src/control/apps/findfeatures/MatchMaker.h b/isis/src/control/apps/findfeatures/MatchMaker.h
index 541481c3f2820f41d376ad286d627981b346818f..643befdad781912cc5dddfda920f4b3e625d2d73 100644
--- a/isis/src/control/apps/findfeatures/MatchMaker.h
+++ b/isis/src/control/apps/findfeatures/MatchMaker.h
@@ -1,26 +1,13 @@
 #ifndef MatchMaker_h
 #define MatchMaker_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 #include <QScopedPointer>
@@ -45,12 +32,12 @@ class ControlMeasure;
 
 /**
  * @brief Container for a feature match pair/set of data sources
- *  
- *  
- * @author 2015-08-18 Kris Becker 
- * @internal 
- *   @history 2015-08-18 Kris Becker - Original Version 
- *   @history 2015-09-29 Kris Becker - Had line/sample transposed when computing 
+ *
+ *
+ * @author 2015-08-18 Kris Becker
+ * @internal
+ *   @history 2015-08-18 Kris Becker - Original Version
+ *   @history 2015-09-29 Kris Becker - Had line/sample transposed when computing
  *                           apriori lat/lon
  */
 
@@ -58,7 +45,7 @@ class MatchMaker : public QLogger {
   public:
     enum GeometrySourceFlag { None, Query, Train };
     MatchMaker();
-    MatchMaker(const QString &name, 
+    MatchMaker(const QString &name,
                const PvlFlatMap &parameters = PvlFlatMap(),
                const QLogger &logger = QLogger());
 
@@ -115,24 +102,24 @@ class MatchMaker : public QLogger {
     MatchImageQList     m_trainers;
     GeometrySourceFlag  m_geomFlag;
 
-    double getParameter(const QString &name, const PvlFlatMap &parameters, 
+    double getParameter(const QString &name, const PvlFlatMap &parameters,
                         const double &defaultParm) const;
 
-    int addMeasure(ControlPoint **cpt, const MatchPair &mpair, 
-                   const cv::DMatch &point, const MatcherSolution &solution) 
-                   const; 
+    int addMeasure(ControlPoint **cpt, const MatchPair &mpair,
+                   const cv::DMatch &point, const MatcherSolution &solution)
+                   const;
 
-    ControlMeasure *makeMeasure(const MatchImage &image, 
-                                const int &keyindex, 
+    ControlMeasure *makeMeasure(const MatchImage &image,
+                                const int &keyindex,
                                 const QString &name = "ControlMeasure") const;
     bool setAprioriLatLon(ControlPoint &point, const ControlMeasure &measure,
                           const MatchImage &image) const;
 
-    double goodnessOfFit(const cv::KeyPoint &query, const cv::KeyPoint &train) 
+    double goodnessOfFit(const cv::KeyPoint &query, const cv::KeyPoint &train)
                          const;
 };
 
-///!<   Shared FeatureAlgorithm pointer that everyone can use 
+///!<   Shared FeatureAlgorithm pointer that everyone can use
 typedef QSharedPointer<MatchMaker> SharedMatchMaker;
 typedef QList<SharedMatchMaker>    MatchMakerQList;
 
diff --git a/isis/src/control/apps/findfeatures/MatchPair.h b/isis/src/control/apps/findfeatures/MatchPair.h
index 5bfccf53d853bd5a2a08ac9eb59b9de1a4b8db1d..eac16539e79610a2da63e704edad66588eb3125d 100644
--- a/isis/src/control/apps/findfeatures/MatchPair.h
+++ b/isis/src/control/apps/findfeatures/MatchPair.h
@@ -1,26 +1,13 @@
 #ifndef MatchPair_h
 #define MatchPair_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 #include <QSharedPointer>
@@ -34,21 +21,21 @@ namespace Isis {
 
 /**
  * @brief Container for a feature match pair of data sources
- *  
- *  
- * @author 2015-08-10 Kris Becker 
- * @internal 
- *   @history 2015-08-10 Kris Becker - Original Version 
+ *
+ *
+ * @author 2015-08-10 Kris Becker
+ * @internal
+ *   @history 2015-08-10 Kris Becker - Original Version
  */
 
 class MatchPair {
   public:
     MatchPair(const MatchImage &query,
-              const MatchImage &train, 
-              const Matches &matches, 
+              const MatchImage &train,
+              const Matches &matches,
               const cv::Mat &homography,
               const cv::Mat &fundamental,
-              const double &matchTime) { 
+              const double &matchTime) {
       m_data = new MatchData();
       m_data->m_query = query;
       m_data->m_train = train;
@@ -73,7 +60,7 @@ class MatchPair {
     QString target() const {
       QString v_target = m_data->m_query.target();
       if ( v_target.isEmpty() ) { v_target = m_data->m_train.target(); }
-      return ( v_target ); 
+      return ( v_target );
     }
 
     inline const MatchImage &query() const {
@@ -148,20 +135,20 @@ class MatchPair {
     inline int correspondence(double *p_repeatability = 0) const {
       float v_repeatability;
       int   v_correspondence;
-      evaluateFeatureDetector(m_data->m_query.image(), 
-                              m_data->m_train.image(), 
+      evaluateFeatureDetector(m_data->m_query.image(),
+                              m_data->m_train.image(),
                               m_data->m_homography,
-                              &m_data->m_query.keypoints(), 
-                              &m_data->m_train.keypoints(), 
+                              &m_data->m_query.keypoints(),
+                              &m_data->m_train.keypoints(),
                               v_repeatability, v_correspondence);
       if ( p_repeatability != 0 ) {  *p_repeatability =  v_repeatability; }
-      return (v_correspondence); 
+      return (v_correspondence);
     }
 
     inline double repeatability() const {
       double v_repeatability;
       (void) correspondence(&v_repeatability);
-      // return ( (double) correspondence() / (double) m_data->m_query.size() ); 
+      // return ( (double) correspondence() / (double) m_data->m_query.size() );
       return ( v_repeatability );
     }
 
@@ -178,11 +165,11 @@ class MatchPair {
     }
 
     inline double duration() const {
-      return ( query().time() + train().time() + this->time() ); 
+      return ( query().time() + train().time() + this->time() );
     }
 
     inline double speed() const {
-      return ( duration() / (double) (query().size() + train().size()) ); 
+      return ( duration() / (double) (query().size() + train().size()) );
     }
 
     inline double distance() const {
@@ -245,31 +232,31 @@ class MatchPair {
     }
 
   private:
-    /** 
+    /**
      *  Shared Image data pointer
-     *  
-     * @author 2015-08-10 Kris Becker 
-     * @internal 
-     *   @history 2015-08-10 Kris Becker - Original Version 
+     *
+     * @author 2015-08-10 Kris Becker
+     * @internal
+     *   @history 2015-08-10 Kris Becker - Original Version
      */
     class MatchData : public QSharedData {
       public:
-        MatchData() : QSharedData(), m_query(), m_train(), 
+        MatchData() : QSharedData(), m_query(), m_train(),
                       m_epipolar_matches(), m_homography_matches(), m_matches(),
                       m_duration(0), m_homography(cv::Mat::eye(3,3,CV_64F)),
                       m_homography_inverse(cv::Mat::eye(3,3,CV_64F)),
                       m_epipolar(cv::Mat::eye(3,3,CV_64F)), m_errors() { }
         MatchData(const MatchData &other) : QSharedData(other),
-                                            m_query(other.m_query), 
-                                            m_train(other.m_train), 
-                                            m_epipolar_matches(), 
+                                            m_query(other.m_query),
+                                            m_train(other.m_train),
+                                            m_epipolar_matches(),
                                             m_homography_matches(),
                                             m_matches(),
-                                            m_duration(0), 
+                                            m_duration(0),
                                             m_homography(cv::Mat::eye(3,3,CV_64F)),
-                                            m_homography_inverse(cv::Mat::eye(3,3,CV_64F)), 
-                                            m_epipolar(cv::Mat::eye(3,3,CV_64F)), 
-                                            m_errors() { } 
+                                            m_homography_inverse(cv::Mat::eye(3,3,CV_64F)),
+                                            m_epipolar(cv::Mat::eye(3,3,CV_64F)),
+                                            m_errors() { }
         ~MatchData() { }
 
         inline void addTime(const double &delta) {
diff --git a/isis/src/control/apps/findfeatures/MatcherAlgorithms.cpp b/isis/src/control/apps/findfeatures/MatcherAlgorithms.cpp
index 0e3609b01bcdfb8c9ac7971434c3afab098f845a..f7a3e981b75b28d948cc01f0af933665f17c94f5 100644
--- a/isis/src/control/apps/findfeatures/MatcherAlgorithms.cpp
+++ b/isis/src/control/apps/findfeatures/MatcherAlgorithms.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QList>
 
@@ -32,10 +19,10 @@ namespace Isis {
   MatcherAlgorithms::MatcherAlgorithms() { }
 
 
-  MatcherAlgorithms::MatcherAlgorithms(FeatureAlgorithmPtr &detector, 
+  MatcherAlgorithms::MatcherAlgorithms(FeatureAlgorithmPtr &detector,
                                        FeatureAlgorithmPtr &extractor,
                                        MatcherAlgorithmPtr &matcher,
-                                       PvlFlatMap parameters)  : 
+                                       PvlFlatMap parameters)  :
                                        m_detector(detector),
                                        m_extractor(extractor),
                                        m_matcher(matcher),
@@ -53,18 +40,18 @@ namespace Isis {
 
 
 /**
- * @brief This method throughly vets the matcher algorithms for validity 
- *  
- * This method insures the contents of this container is valid for its intend 
- * operations. This includes ensuring that the detector, extractor and matcher 
- * algorithms have all been allocated. If this is valid  
- * 
+ * @brief This method throughly vets the matcher algorithms for validity
+ *
+ * This method insures the contents of this container is valid for its intend
+ * operations. This includes ensuring that the detector, extractor and matcher
+ * algorithms have all been allocated. If this is valid
+ *
  * @author 2016-12-23 Kris Becker
- * 
+ *
  * @param throwOnErrors Throw a cummulative exception reporting errors if true
- * 
- * @return bool Returns true if no errors are found. If errors are found and 
- *              the throwOnErrors parameters is false, it will return false. 
+ *
+ * @return bool Returns true if no errors are found. If errors are found and
+ *              the throwOnErrors parameters is false, it will return false.
  */
   bool MatcherAlgorithms::validate(const bool &throwOnErrors) const {
     // Accumulate errors for a comprehensive list of issues
@@ -72,16 +59,16 @@ namespace Isis {
     int nerrors(0);
 
     // Check the detector algorithm to ensure all are allocated properly
-    // and it contains the require functionality 
+    // and it contains the require functionality
     if ( m_detector.empty() ){
-      ie.append(IException(IException::Programmer, 
+      ie.append(IException(IException::Programmer,
                            "Required detector algorithm has not been allocated",
                            _FILEINFO_));
       nerrors++;
     }
     else {
       if ( !m_detector->isValid() )  {
-        ie.append(IException(IException::Programmer, 
+        ie.append(IException(IException::Programmer,
                              "Required detector algorithm is not present/valid",
                              _FILEINFO_));
         nerrors++;
@@ -96,16 +83,16 @@ namespace Isis {
     }
 
     // Check the extractor algorithm to ensure all are allocated properly and it
-    // contains the require functionality 
+    // contains the require functionality
     if ( m_extractor.empty() ) {
-      ie.append(IException(IException::Programmer, 
+      ie.append(IException(IException::Programmer,
                            "Required extractor algorithm has not been allocated",
                            _FILEINFO_));
       nerrors++;
     }
     else {
       if ( !m_extractor->isValid() ) {
-        ie.append(IException(IException::Programmer, 
+        ie.append(IException(IException::Programmer,
                              "Required extractor algorithm is not present",
                              _FILEINFO_));
         nerrors++;
@@ -119,17 +106,17 @@ namespace Isis {
       }
     }
 
-    // Check the matcher algorithm to ensure all are allocated properly and it 
-    // contains the require functionality 
+    // Check the matcher algorithm to ensure all are allocated properly and it
+    // contains the require functionality
     if ( m_matcher.empty() )  {
-      ie.append(IException(IException::Programmer, 
+      ie.append(IException(IException::Programmer,
                            "Required matcher algorithm has not been allocated",
                            _FILEINFO_));
       nerrors++;
     }
     else {
       if ( !m_matcher->isValid() ) {
-        ie.append(IException(IException::Programmer, 
+        ie.append(IException(IException::Programmer,
                              "Required matcher algorithm is not present",
                              _FILEINFO_));
         nerrors++;
@@ -145,7 +132,7 @@ namespace Isis {
 
     //  Shall we throw an exception to report the issues?
     if ( (0 < nerrors) && (true == throwOnErrors)) {
-      QString mess = "There were " + QString::number(nerrors) + 
+      QString mess = "There were " + QString::number(nerrors) +
                      " errors found in this matcher algorithm set";
       ie.append(IException(IException::Programmer, mess, _FILEINFO_));
       throw ie;
diff --git a/isis/src/control/apps/findfeatures/MatcherAlgorithms.h b/isis/src/control/apps/findfeatures/MatcherAlgorithms.h
index 961716ea3aa97ed6d7cd2f3796137966c1838be6..ddbbcd833799eded4af48df8db00cd0bea2ecad0 100644
--- a/isis/src/control/apps/findfeatures/MatcherAlgorithms.h
+++ b/isis/src/control/apps/findfeatures/MatcherAlgorithms.h
@@ -1,26 +1,14 @@
 #ifndef MatcherAlgorithms_h
 #define MatcherAlgorithms_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <opencv2/core.hpp>
 #include <opencv2/features2d.hpp>
@@ -36,14 +24,14 @@ namespace Isis {
 
 /**
  * @brief Generic container for ISIS/OpenCV-type feature matcher algorithms
- *  
- * This class provides a container for the three elements of feature-based 
- * matching: detector, extractor and matcher. An addition container of robust 
- * matcher outlier detection is added as a "paramters" specification. 
- *  
+ *
+ * This class provides a container for the three elements of feature-based
+ * matching: detector, extractor and matcher. An addition container of robust
+ * matcher outlier detection is added as a "paramters" specification.
+ *
  * @author  2016-11-29 Kris Becker
- *  
- * @internal 
+ *
+ * @internal
  *   @history 2016-11-29 Kris Becker - Original Version
  */
 
@@ -51,7 +39,7 @@ class MatcherAlgorithms {
   public:
     MatcherAlgorithms();
 
-    MatcherAlgorithms(FeatureAlgorithmPtr &detector, 
+    MatcherAlgorithms(FeatureAlgorithmPtr &detector,
                       FeatureAlgorithmPtr &extractor,
                       MatcherAlgorithmPtr &matcher,
                       PvlFlatMap parameters = PvlFlatMap());
diff --git a/isis/src/control/apps/findfeatures/MatcherSolution.h b/isis/src/control/apps/findfeatures/MatcherSolution.h
index 03e497addb00788fcdd0ac3ee7d49951b0b3255a..3b0bcacd524032df15cdc5dfff978edaf7c647da 100644
--- a/isis/src/control/apps/findfeatures/MatcherSolution.h
+++ b/isis/src/control/apps/findfeatures/MatcherSolution.h
@@ -1,26 +1,14 @@
 #ifndef MatcherSolution_h
 #define MatcherSolution_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QString>
 #include <QSharedPointer>
@@ -46,11 +34,11 @@ typedef QList<SharedMatcherSolution>    MatcherSolutionList;
 
 /**
  * @brief Contains a feature-based match solution
- *  
- *  
- * @author 2015-08-10 Kris Becker 
- * @internal 
- *   @history 2015-08-10 Kris Becker - Original Version 
+ *
+ *
+ * @author 2015-08-10 Kris Becker
+ * @internal
+ *   @history 2015-08-10 Kris Becker - Original Version
  */
 
 class MatcherSolution : public QLogger {
@@ -59,17 +47,17 @@ class MatcherSolution : public QLogger {
     typedef MatchPairQList::const_iterator MatchPairConstIterator;
 
     MatcherSolution() { }
-    MatcherSolution(const SharedRobustMatcher &matcher, 
+    MatcherSolution(const SharedRobustMatcher &matcher,
                     const MatchPair &pair,
                     const QLogger &logger = QLogger()) : QLogger(logger),
-                    m_matcher(matcher), m_pairs() { 
+                    m_matcher(matcher), m_pairs() {
       m_pairs.push_back(pair);
-    } 
+    }
 
     MatcherSolution(const SharedRobustMatcher &matcher,
-                    const MatchPairQList &pairs, 
+                    const MatchPairQList &pairs,
                     const QLogger &logger = QLogger()) : QLogger(logger),
-                    m_matcher(matcher), m_pairs(pairs) { } 
+                    m_matcher(matcher), m_pairs(pairs) { }
 
     virtual ~MatcherSolution() { }
 
@@ -101,11 +89,11 @@ class MatcherSolution : public QLogger {
       }
       return ( stats );
     }
-   
+
     double quality() const {
       return ( qualityStatistics().Average() );
     }
-   
+
     MatchPairIterator begin() {
       return ( m_pairs.begin() );
     }
@@ -144,15 +132,15 @@ class MatcherSolution : public QLogger {
 
   /**
    * @brief Determine match with best solution
-   * 
+   *
    * @author Kris Becker 2015-08-29
-   * 
+   *
    * @param matches            List of match solutions with some unique elements
-   * 
-   * @return MatcherSolution*  Pointer to best match. This SHOULD NOT be freed 
+   *
+   * @return MatcherSolution*  Pointer to best match. This SHOULD NOT be freed
    *                           as ownership is retained in this object
    */
-  static const MatcherSolution *best( const MatcherSolutionList &matches ) { 
+  static const MatcherSolution *best( const MatcherSolutionList &matches ) {
     if ( matches.size()  <= 0 ) { return ( 0 );  }
 
     SharedMatcherSolution candidate(matches[0]);
diff --git a/isis/src/control/apps/findfeatures/ORBAlgorithm.cpp b/isis/src/control/apps/findfeatures/ORBAlgorithm.cpp
index a6272484ebaf76503bc2c854100ef6f62012812f..5c4dfb9ca78ad298651ebdccb588184ee0a515af 100644
--- a/isis/src/control/apps/findfeatures/ORBAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/ORBAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/bimap.hpp>
 #include <boost/foreach.hpp>
@@ -34,9 +21,9 @@ namespace Isis {
   /**
    * Constructs the ORB algorithm with default variables.
    */
-  ORBAlgorithm::ORBAlgorithm() : 
+  ORBAlgorithm::ORBAlgorithm() :
                  Feature2DAlgorithm("ORB", "Feature2D",
-                                     ORBType::create()) {  
+                                     ORBType::create()) {
     setupTypeMap();
     m_variables.merge( getAlgorithmVariables() );
   }
@@ -44,13 +31,13 @@ namespace Isis {
 
   /**
    * Constructs the ORB algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   ORBAlgorithm::ORBAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                  Feature2DAlgorithm("ORB", "Feature2D", 
+                  Feature2DAlgorithm("ORB", "Feature2D",
                                       ORBType::create(), cvars) {
     setupTypeMap();
     setConfig(config);
@@ -67,7 +54,7 @@ namespace Isis {
 
   /**
    * Returns a description of the ORB algorithm.
-   * 
+   *
    * @return @b QString A description of the ORB algorithm.
    */
   QString ORBAlgorithm::description() const {
@@ -90,7 +77,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the ORB algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -101,38 +88,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool ORBAlgorithm::hasDetector() const { 
-    return true; 
+  bool ORBAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool ORBAlgorithm::hasExtractor() const { 
-    return true; 
+  bool ORBAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool ORBAlgorithm::hasMatcher() const { 
-    return false; 
+  bool ORBAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the ORB algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap ORBAlgorithm::getAlgorithmVariables( ) const {
@@ -154,11 +141,11 @@ namespace Isis {
 
 /**
  * Set parameters as provided by the variables
- * 
+ *
  * @param variables Container of parameters to set
- * 
+ *
  * @return @b int Number of variables actually set
- * 
+ *
  * @throws IException::User "The input value is not valid for ORB's [scoreType] variable"
  */
   int ORBAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) {
@@ -166,36 +153,36 @@ namespace Isis {
     ORBPtr algorithm = m_algorithm.dynamicCast<ORBType>();
 
     int numSet(0);
-    if ( variables.exists("nfeatures") ) { 
+    if ( variables.exists("nfeatures") ) {
       algorithm->setMaxFeatures(toInt(variables.get("nfeatures")));
       numSet++;
     }
 
-    if ( variables.exists("scaleFactor") ) { 
+    if ( variables.exists("scaleFactor") ) {
       algorithm->setScaleFactor(toDouble(variables.get("scaleFactor")));
       numSet++;
     }
 
 
-     if ( variables.exists("nlevels") ) { 
+     if ( variables.exists("nlevels") ) {
       algorithm->setNLevels(toInt(variables.get("nlevels")));
       numSet++;
      }
 
-     if ( variables.exists("edgeThreshold") ) { 
+     if ( variables.exists("edgeThreshold") ) {
       algorithm->setEdgeThreshold(toInt(variables.get("edgeThreshold")));
       numSet++;
-     }     
+     }
 
-     if ( variables.exists("firstLevel") ) { 
+     if ( variables.exists("firstLevel") ) {
       algorithm->setFirstLevel(toInt(variables.get("firstLevel")));
       numSet++;
-     }     
+     }
 
-     if ( variables.exists("WTA_K") ) { 
+     if ( variables.exists("WTA_K") ) {
       algorithm->setWTA_K(toInt(variables.get("WTA_K")));
       numSet++;
-     }    
+     }
 
 
      if ( variables.exists("scoreType") ) {
@@ -222,12 +209,12 @@ namespace Isis {
       algorithm->setScoreType(intValue);
       numSet++;
 
-     if ( variables.exists("patchSize") ) { 
+     if ( variables.exists("patchSize") ) {
       algorithm->setPatchSize(toInt(variables.get("patchSize")));
       numSet++;
-     }     
+     }
 
-     if ( variables.exists("fastThreshold") ) { 
+     if ( variables.exists("fastThreshold") ) {
       algorithm->setPatchSize(toInt(variables.get("fastThreshold")));
       numSet++;
      }
@@ -236,4 +223,3 @@ namespace Isis {
   }
 
 };  // namespace Isis
-
diff --git a/isis/src/control/apps/findfeatures/ORBAlgorithm.h b/isis/src/control/apps/findfeatures/ORBAlgorithm.h
index 28c567b5040b6648f775b42bbe42e045334bcc5c..59a4558cccb96dcae43653ed594f2b6f91447e00 100644
--- a/isis/src/control/apps/findfeatures/ORBAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/ORBAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef ORBAlgorithm_h
 #define ORBAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/features2d.hpp"
@@ -31,14 +19,14 @@
 namespace Isis {
 
 /**
- * @brief ORB Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 ORB Feature2D algortithm. 
- *  
+ * @brief ORB Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 ORB Feature2D algortithm.
+ *
  * @author  2016-12-08 Kristin Berry
- *  
- * @internal 
- *   @history 2016-12-08 Kristin Berry - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-08 Kristin Berry - Original Version
  */
 
 class ORBAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/QDebugLogger.h b/isis/src/control/apps/findfeatures/QDebugLogger.h
index 60990bde9a4fd0aeed2b58f2cdfd12549c6e6b82..3a530b66055e6734944cf5424b0ce6d5fe90ca2b 100644
--- a/isis/src/control/apps/findfeatures/QDebugLogger.h
+++ b/isis/src/control/apps/findfeatures/QDebugLogger.h
@@ -1,26 +1,14 @@
 #ifndef QDebugLogger_h
 #define QDebugLogger_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cstdio>
 
 #include <QDebug>
@@ -47,18 +35,18 @@ typedef QSharedPointer<QDebugLogger> QDebugStream;
 
 /**
  * @brief Specialized class to provide consistent interface to debug logger
- *  
- * This interface provides some flexibility in constructing an easy to use 
- * interface to a generic output streams.  The methods available here are 
- * designed to enforce a shared pointer API. This is necessary as QFILE and 
- * QDebugStreamType must coexist. Scoped pointers enforce this requirement. 
- *  
- * Some QDebugStreamTypes may require flushing after writing in order 
- * immediately to see the output. 
- *  
- * @author 2015-09-09 Kris Becker 
- * @internal 
- *   @history 2015-09-09 Kris Becker - Original Version 
+ *
+ * This interface provides some flexibility in constructing an easy to use
+ * interface to a generic output streams.  The methods available here are
+ * designed to enforce a shared pointer API. This is necessary as QFILE and
+ * QDebugStreamType must coexist. Scoped pointers enforce this requirement.
+ *
+ * Some QDebugStreamTypes may require flushing after writing in order
+ * immediately to see the output.
+ *
+ * @author 2015-09-09 Kris Becker
+ * @internal
+ *   @history 2015-09-09 Kris Becker - Original Version
  *   @history 2016-04-26 Ian Humphrey - Modified open mode for /dev/null so that QIODevice::Append
  *                           is not set. This causes a seek to occur (to end of device) on a
  *                           sequential device (see Qt5 documentation on QIODevice::isSequential),
@@ -68,32 +56,32 @@ typedef QSharedPointer<QDebugLogger> QDebugStream;
 class QDebugLogger {
   public:
     /** Release in specific order */
-    ~QDebugLogger() {  
+    ~QDebugLogger() {
       m_dbuglog.reset();
       m_dbugfile.reset();
     }
 
     /** Map files to the logger using this method */
-    static QDebugStream create(const QString &filename, 
-                               const QIODevice::OpenMode &omode = 
-                                                        (QIODevice::WriteOnly | 
-                                                         QIODevice::Append | 
+    static QDebugStream create(const QString &filename,
+                               const QIODevice::OpenMode &omode =
+                                                        (QIODevice::WriteOnly |
+                                                         QIODevice::Append |
                                                          QIODevice::Text |
-                                                         QIODevice::Unbuffered) ) { 
+                                                         QIODevice::Unbuffered) ) {
       // Default condition is to write to std::cout
       if ( filename.isEmpty() ) {  return ( toStdOut() );  }
 
       // Set up file access logging
-      FileName t_fname(filename); 
+      FileName t_fname(filename);
       QScopedPointer<QFile> t_dbugfile( QDebugLogger::open( t_fname.expanded(), omode) );
       QScopedPointer<QDebugStreamType> t_dbuglog( new QDebugStreamType( t_dbugfile.data() ) );
       return ( QDebugStream( new QDebugLogger( t_dbugfile.take(), t_dbuglog.take() ) ) );
     }
 
     /** Map streams like stdout, stderr, etc..., using this method */
-    static QDebugStream create(FILE *fh, const QIODevice::OpenMode &omode = 
-                                                        (QIODevice::WriteOnly | 
-                                                         QIODevice::Append | 
+    static QDebugStream create(FILE *fh, const QIODevice::OpenMode &omode =
+                                                        (QIODevice::WriteOnly |
+                                                         QIODevice::Append |
                                                          QIODevice::Text |
                                                          QIODevice::Unbuffered) ) {
        QScopedPointer<QFile> t_dbugfile( new QFile() );
@@ -105,12 +93,12 @@ class QDebugLogger {
 
     /** Map strings to debugger output device using this method. Set
      *  appropriate parameters for proper compilation above. */
-    static QDebugStream create(QString *dbstring, 
+    static QDebugStream create(QString *dbstring,
                                const QIODevice::OpenMode &omode = QIODevice::WriteOnly ) {
 
       // Check for string support in debugger
 #if ( STRING_DEBUG_SUPPORT == 0 )
-       throw IException(IException::Programmer, 
+       throw IException(IException::Programmer,
                         "QDebugLogger does not support strings as an output device!",
                         _FILEINFO_);
 #endif
@@ -154,8 +142,8 @@ class QDebugLogger {
     // shared pointer API
     /** Default constructor defined here to deny direct instantiation. This
      *  helps enforces the shared pointer API */
-    QDebugLogger() { 
-       m_dbugfile.reset( QDebugLogger::open("/dev/null", QIODevice::WriteOnly | 
+    QDebugLogger() {
+       m_dbugfile.reset( QDebugLogger::open("/dev/null", QIODevice::WriteOnly |
                                                          QIODevice::Unbuffered) );
        m_dbuglog.reset( new QDebugStreamType( m_dbugfile.data() ) );
     }
@@ -166,7 +154,7 @@ class QDebugLogger {
     QDebugLogger operator=(const QDebugLogger &other);
 
     /** Direct instantiation of prepared components for a logger stream   */
-    QDebugLogger(QFile *logfile, QDebugStreamType *logger) : 
+    QDebugLogger(QFile *logfile, QDebugStreamType *logger) :
                  m_dbugfile(logfile), m_dbuglog(logger) { }
 
     // These variables consistently manage logging activities
@@ -174,30 +162,30 @@ class QDebugLogger {
     QScopedPointer<QDebugStreamType> m_dbuglog;
 
     /** Method creates a QFile from a filename */
-    static QFile *open(const QString &filename, 
-                       const QIODevice::OpenMode &omode) { 
+    static QFile *open(const QString &filename,
+                       const QIODevice::OpenMode &omode) {
       FileName t_fname(filename);
       QScopedPointer<QFile> t_dbugfile(new QFile( t_fname.expanded() ) );
       if ( !t_dbugfile->open(omode) ) {
-        QString mess = "Unable to open/create debug log stream for file: " + 
-                       filename; 
+        QString mess = "Unable to open/create debug log stream for file: " +
+                       filename;
         throw IException(IException::User, mess, _FILEINFO_);
-      } 
+      }
       return ( t_dbugfile.take() );
     }
 };
 
 
 /**
- * @brief API for indepent logger usage 
- *  
- * Users of the QDebugLogger system can inherit from this class and include the 
- * interface in their classes seamlessly. Or can make an instance of it and use 
- * it directly as a member class. 
- * 
- * @author 2015-09-09 Kris Becker 
- * @internal 
- *   @history 2015-09-09 Kris Becker - Original Version 
+ * @brief API for indepent logger usage
+ *
+ * Users of the QDebugLogger system can inherit from this class and include the
+ * interface in their classes seamlessly. Or can make an instance of it and use
+ * it directly as a member class.
+ *
+ * @author 2015-09-09 Kris Becker
+ * @internal
+ *   @history 2015-09-09 Kris Becker - Original Version
  */
 class QLogger {
   public:
diff --git a/isis/src/control/apps/findfeatures/RobustMatcher.cpp b/isis/src/control/apps/findfeatures/RobustMatcher.cpp
index 156be235b280c97a18c0e005e55546bb42dd5d31..3977959bed14d1b70893b0dd12791017775344fa 100644
--- a/isis/src/control/apps/findfeatures/RobustMatcher.cpp
+++ b/isis/src/control/apps/findfeatures/RobustMatcher.cpp
@@ -1,26 +1,11 @@
-/**
- * @file
- * $Revision$
- * $Date$
- * $Id$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 
 #include <string>
@@ -61,17 +46,17 @@ RobustMatcher::RobustMatcher() : MatcherAlgorithms(), QLogger(),
 }
 
 
-RobustMatcher::RobustMatcher(const QString &name) : 
-                             MatcherAlgorithms(), 
-                             QLogger(),m_name(name), 
+RobustMatcher::RobustMatcher(const QString &name) :
+                             MatcherAlgorithms(),
+                             QLogger(),m_name(name),
                              m_parameters() {
   init();
 }
 
-RobustMatcher::RobustMatcher(const QString &name, 
+RobustMatcher::RobustMatcher(const QString &name,
                              const MatcherAlgorithms &algorithms,
                              const PvlFlatMap &parameters,
-                             const QLogger &logger) : 
+                             const QLogger &logger) :
                              MatcherAlgorithms(algorithms),QLogger(logger),
                              m_name(name), m_parameters() {
   init(parameters);
@@ -672,7 +657,7 @@ bool RobustMatcher::removeOutliers(const cv::Mat &queryDescriptors,
 // i.e. size will be 0)
 int RobustMatcher::ratioTest(std::vector<std::vector<cv::DMatch> > &matches,
                              double &mtime) const {
-  
+
   double v_ratio = toDouble(m_parameters.get("Ratio"));
   if ( isDebug() ) {
     logger() << "Entered RobustMatcher::ratioTest(matches[2]) for 2 NearestNeighbors (NN)...\n";
@@ -817,7 +802,7 @@ cv::Mat RobustMatcher::ransacTest(const std::vector<cv::DMatch>& matches,
   cv::Mat fundamental = cv::Mat::eye(3,3,CV_64F);
 
   // See if enough points to compute fundamental matrix. Minumum number needed
-  // for RANSAC is 8 points. 
+  // for RANSAC is 8 points.
   int v_minEpiPoints = toInt(m_parameters.get("MinimumFundamentalPoints"));
   if ( (unsigned int) v_minEpiPoints > matches.size() ) {
     if ( isDebug() ) {
@@ -884,8 +869,8 @@ cv::Mat RobustMatcher::ransacTest(const std::vector<cv::DMatch>& matches,
   if ( toBool(m_parameters.get("RefineFundamentalMatrix"))  ) {
 
     // See if enough points to compute fundamental matrix. Minumum number needed
-    // for RANSAC is 8 points. 
-    int v_minEpiPoints = toInt(m_parameters.get("MinimumFundamentalPoints")); 
+    // for RANSAC is 8 points.
+    int v_minEpiPoints = toInt(m_parameters.get("MinimumFundamentalPoints"));
     if ( (unsigned int) v_minEpiPoints <= outMatches.size() ) {
 
       // Make a copy of the inliers of the first fundamental processing
diff --git a/isis/src/control/apps/findfeatures/RobustMatcher.h b/isis/src/control/apps/findfeatures/RobustMatcher.h
index d1b1ffde4eaec7dfad0fb2165dd352817c24d4ec..a643f3985e9a560a69f678264a60c18351dcf098 100644
--- a/isis/src/control/apps/findfeatures/RobustMatcher.h
+++ b/isis/src/control/apps/findfeatures/RobustMatcher.h
@@ -1,26 +1,14 @@
 #ifndef RobustMatcher_h
 #define RobustMatcher_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QString>
 #include <QSharedPointer>
@@ -42,77 +30,77 @@ class QDebug;
 
 /**
  * @brief Container for a feature match pair of data sources
- *  
- *  
- * @author 2015-08-18 Kris Becker 
- * @internal 
- *   @history 2015-08-18 Kris Becker - Original Version 
+ *
+ *
+ * @author 2015-08-18 Kris Becker
+ * @internal
+ *   @history 2015-08-18 Kris Becker - Original Version
  *   @history 2016-10-05 Ian Humphrey & Makayla Shepherd - Changed headers to OpenCV2.
  */
   class RobustMatcher : public MatcherAlgorithms, public QLogger {
-  
+
     public:
       RobustMatcher();
       RobustMatcher(const QString &name);
-      RobustMatcher(const QString &name, 
+      RobustMatcher(const QString &name,
                     const MatcherAlgorithms &algorithms,
                     const PvlFlatMap &parameters = PvlFlatMap(),
                     const QLogger &logger = QLogger());
       virtual ~RobustMatcher();
-  
+
       void setName(const QString &name);
       inline QString name() const {  return ( m_name );  }
-  
-      // For just images, MatchImage objects are created generically using the 
+
+      // For just images, MatchImage objects are created generically using the
       // other match interfaces
       MatchPair      match(cv::Mat& query, cv::Mat& trainer) const;
       MatchPairQList match(cv::Mat& query, std::vector<cv::Mat>& trainers) const;
-  
+
       // Formal matching methods
       MatchPair      match(MatchImage &query, MatchImage &train) const;
       MatchPairQList match(MatchImage &query, MatchImageQList &trainers) const;
-  
+
       // Robust outlier removal
       bool removeOutliers(const cv::Mat &queryDescriptors,
                           const cv::Mat &trainDescriptors,
                           std::vector<cv::KeyPoint>& queryKeypoints,
                           std::vector<cv::KeyPoint>& trainKeypoints,
-                          std::vector<cv::DMatch> &homography_matches, 
-                          std::vector<cv::DMatch> &epipolar_matches, 
+                          std::vector<cv::DMatch> &homography_matches,
+                          std::vector<cv::DMatch> &epipolar_matches,
                           std::vector<cv::DMatch> &matches,
                           cv::Mat &homography, cv::Mat &fundamental,
-                          double &mtime, const bool onErrorThrow = true) 
+                          double &mtime, const bool onErrorThrow = true)
                           const;
-  
+
       int ratioTest( std::vector<std::vector<cv::DMatch> > &matches,
                      double &mtime) const;
-  
+
       void symmetryTest(const std::vector<std::vector<cv::DMatch> >& matches1,
                         const std::vector<std::vector<cv::DMatch> >& matches2,
                         std::vector<cv::DMatch>& symMatches, double &mtime) const;
-  
+
       cv::Mat ransacTest(const std::vector<cv::DMatch>& matches,
                          const std::vector<cv::KeyPoint>& keypoints1,
                          const std::vector<cv::KeyPoint>& keypoints2,
                          std::vector<cv::DMatch>& outMatches, double &mtime,
                          const bool onErrorThrow = true) const;
-  
+
       cv::Mat computeHomography(const std::vector<cv::KeyPoint>& query,
-                                const std::vector<cv::KeyPoint>& train, 
+                                const std::vector<cv::KeyPoint>& train,
                                 const std::vector<cv::DMatch> &matches,
                                 std::vector<cv::DMatch> &inliers,
                                 double &mtime,
                                 const int method = CV_FM_RANSAC,
                                 const double tolerance = 3.0,
                                 const bool refine = true,
-                                const bool onErrorThrow = true) 
+                                const bool onErrorThrow = true)
                                 const;
 
       const PvlFlatMap &parameters() const;
-    
+
       // This hides the MatcherAlgorithm version which will be augmented
       PvlObject info(const QString &p_name = "RobustMatcher") const;
-  
+
     private:
       QString      m_name;        // Name of matcher
       PvlFlatMap   m_parameters;  // Parameters for matcher
@@ -120,10 +108,10 @@ class QDebug;
       void init(const PvlFlatMap &parameters = PvlFlatMap());
       void RootSift(cv::Mat &descriptors, const float eps = 1.0E-7) const;
       double elapsed(const QTime &runtime) const;  // returns seconds
-  
+
   };
-  
-  ///!<   Shared FeatureAlgorithm pointer that everyone can use 
+
+  ///!<   Shared FeatureAlgorithm pointer that everyone can use
   typedef QSharedPointer<RobustMatcher> SharedRobustMatcher;
   typedef QList<SharedRobustMatcher>    RobustMatcherList;
 
diff --git a/isis/src/control/apps/findfeatures/SIFTAlgorithm.cpp b/isis/src/control/apps/findfeatures/SIFTAlgorithm.cpp
index 5f31cc9ba18f8a57b2c9bc5964d96461583e82b8..608c6888afd73c9032a26a5bc61b61f62fd93160 100644
--- a/isis/src/control/apps/findfeatures/SIFTAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/SIFTAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -30,23 +17,23 @@
 namespace Isis {
 
   /**
-   * Constructs an empty SiftAlgorithm with default variables. 
+   * Constructs an empty SiftAlgorithm with default variables.
    */
-  SIFTAlgorithm::SIFTAlgorithm() : 
+  SIFTAlgorithm::SIFTAlgorithm() :
                  Feature2DAlgorithm( "SIFT", "Feature2D",
-                                      SIFTType::create() ) {  
+                                      SIFTType::create() ) {
     setupParameters();
   }
 
 
   /**
-   * Constructs a SIFTAlgorithm with input variables. 
-   *  
+   * Constructs a SIFTAlgorithm with input variables.
+   *
    * @param cvars Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
-  SIFTAlgorithm::SIFTAlgorithm(const PvlFlatMap &cvars, const QString &config) : 
-                 Feature2DAlgorithm("SIFT", "Feature2D", 
+  SIFTAlgorithm::SIFTAlgorithm(const PvlFlatMap &cvars, const QString &config) :
+                 Feature2DAlgorithm("SIFT", "Feature2D",
                                      SIFTType::create(), cvars) {
     setConfig(config);
     PvlFlatMap variables = setupParameters();
@@ -57,7 +44,7 @@ namespace Isis {
     const double edgeThreshold = toDouble(variables.get("edgeThreshold"));
     const double sigma = toDouble(variables.get("sigma"));
 
-    m_algorithm = SIFTType::create(nfeatures, nOctaveLayers, contrastThreshold, 
+    m_algorithm = SIFTType::create(nfeatures, nOctaveLayers, contrastThreshold,
                                    edgeThreshold, sigma);
 
     m_variables.merge(variables);
@@ -71,9 +58,9 @@ namespace Isis {
 
 
   /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap SIFTAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -89,7 +76,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString SIFTAlgorithm::description() const {
@@ -102,10 +89,10 @@ namespace Isis {
 
   /**
    * Creates and returns an intance of SIFTAlgorithm.
-   *  
+   *
    * @param vars PvlFlatMap containing algorithm parameters and their values
    * @param config A configuration string input by the user
-   * 
+   *
    * @return @b Feature2DAlgorithm An instance of SIFTAlgorithm
    */
   Feature2DAlgorithm *SIFTAlgorithm::create(const PvlFlatMap &vars, const QString &config) {
@@ -115,39 +102,39 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool SIFTAlgorithm::hasDetector() const { 
-    return true; 
+  bool SIFTAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool SIFTAlgorithm::hasExtractor() const { 
-    return true; 
+  bool SIFTAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool SIFTAlgorithm::hasMatcher() const { 
-    return false; 
+  bool SIFTAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
 /**
  * Get and return SIFT's parameters and what they're set to as a PvlFlatMap.
- *  
- * @return @b PvlFlatMap A PvlFlatMap of SIFT's currently set variables and their values. 
+ *
+ * @return @b PvlFlatMap A PvlFlatMap of SIFT's currently set variables and their values.
  */
   PvlFlatMap SIFTAlgorithm::getAlgorithmVariables( ) const {
     return ( variables() );
@@ -155,22 +142,21 @@ namespace Isis {
 
 
 /**
- * @brief Set parameters as provided by the variables, does not work for the 
- * SIFT algorithm in OpenCV3, so calling this will throw an exception. 
- * Always returns -1. 
- * 
+ * @brief Set parameters as provided by the variables, does not work for the
+ * SIFT algorithm in OpenCV3, so calling this will throw an exception.
+ * Always returns -1.
+ *
  * @param variables Container of parameters to set
- *  
+ *
  * @throws IException::Programmer "SIFT does not have the ability to set algorithm parameters.";
- *  
+ *
  * @return @b int -1 Cannot set the Algorithm Variables
  */
   int SIFTAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) {
     QString message = "SIFT does not have the ability to set algorithm parameters.";
-    throw IException(IException::Programmer, message, _FILEINFO_);   
+    throw IException(IException::Programmer, message, _FILEINFO_);
 
     return (-1);
   }
 
 };  // namespace Isis
-
diff --git a/isis/src/control/apps/findfeatures/SIFTAlgorithm.h b/isis/src/control/apps/findfeatures/SIFTAlgorithm.h
index 4c3304dba0382c3146cf390699de7ce9bd6fd40c..b5b5fa1436c31de67e311f18a099eaa680b63af2 100644
--- a/isis/src/control/apps/findfeatures/SIFTAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/SIFTAlgorithm.h
@@ -1,26 +1,13 @@
 #ifndef SIFTAlgorithm_h
 #define SIFTAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/xfeatures2d.hpp"
@@ -30,16 +17,16 @@
 namespace Isis {
 
 /**
- * @brief SIFT Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 SIFT Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief SIFT Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 SIFT Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-11-30 Kris Becker
- *  
- * @internal 
+ *
+ * @internal
  *   @history 2016-11-30 Kris Becker - Original Version
- *   @history 2016-12-06 Kristin Berry - Updates for OpenCV3 
+ *   @history 2016-12-06 Kristin Berry - Updates for OpenCV3
  */
 
 class SIFTAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/SURFAlgorithm.cpp b/isis/src/control/apps/findfeatures/SURFAlgorithm.cpp
index d9dca5f89713bbd6239ab38888de358b7b283102..1e8085ff0647b74b5e48fb89f31b740c9cfc1ab1 100644
--- a/isis/src/control/apps/findfeatures/SURFAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/SURFAlgorithm.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -30,7 +16,7 @@
 namespace Isis {
 
   /**
-   * Constructs a default SURFAlgorithm with default variables. 
+   * Constructs a default SURFAlgorithm with default variables.
    */
   SURFAlgorithm::SURFAlgorithm() : Feature2DAlgorithm("SURF", "Feature2D", SURFType::create()) {
     m_variables.merge( getAlgorithmVariables() );
@@ -38,13 +24,13 @@ namespace Isis {
 
 
 /**
- * Constructs a SURFAlgorithm with input variables. 
- * 
+ * Constructs a SURFAlgorithm with input variables.
+ *
  * @param cvars Variables that are not included will be set to their default.
  * @param config The config string used to construct cvars.
  */
   SURFAlgorithm::SURFAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                               Feature2DAlgorithm("SURF", "Feature2D", 
+                               Feature2DAlgorithm("SURF", "Feature2D",
                                                   SURFType::create()) {
     setConfig(config);
     setAlgorithmVariables(cvars);
@@ -61,8 +47,8 @@ namespace Isis {
 
 
 /**
- * Returns a description of the DaisyAlgorithm. 
- * 
+ * Returns a description of the DaisyAlgorithm.
+ *
  * @return @b QString A description of the algorithm.
  */
   QString SURFAlgorithm::description() const {
@@ -75,11 +61,11 @@ namespace Isis {
 
 /**
  * Creates and returns an instance of SURFAlgorithm.
- * 
+ *
  * @param vars PvlFlatMap containing algorithm parameters and their values
  * @param config A configuration string input by the user
- * 
- * @return Feature2DAlgorithm 
+ *
+ * @return Feature2DAlgorithm
  */
   Feature2DAlgorithm *SURFAlgorithm::create(const PvlFlatMap &vars, const QString &config) {
     return ( new SURFAlgorithm(vars, config) );
@@ -87,48 +73,48 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool SURFAlgorithm::hasDetector() const { 
-    return true; 
+  bool SURFAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool SURFAlgorithm::hasExtractor() const { 
-    return true; 
+  bool SURFAlgorithm::hasExtractor() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool SURFAlgorithm::hasMatcher() const { 
-    return false; 
+  bool SURFAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
 
 /**
- * @brief Retreive all SURF algorithm variable defaults and populate container 
- *  
- * This method will retreive the current values of all the variables as they 
- * are currently set in the algorithm. 
- *  
- * Typically, this is called upon instantiation of the algorithm which provides 
- * the default state of the variables. However, it is reentrant such that it 
- * will return the current state of all the variables. 
- * 
- * @author 2016-12-07 Kris Becker 
- * 
+ * @brief Retreive all SURF algorithm variable defaults and populate container
+ *
+ * This method will retreive the current values of all the variables as they
+ * are currently set in the algorithm.
+ *
+ * Typically, this is called upon instantiation of the algorithm which provides
+ * the default state of the variables. However, it is reentrant such that it
+ * will return the current state of all the variables.
+ *
+ * @author 2016-12-07 Kris Becker
+ *
  * @return PvlFlatMap Container with all the SURF variables and values
  */
   PvlFlatMap SURFAlgorithm::getAlgorithmVariables( ) const {
@@ -144,38 +130,38 @@ namespace Isis {
 
 /**
  * @brief Set parameters as provided by the variables
- * 
+ *
  * @author  2016-12-06 Kris Becker
- * 
+ *
  * @param variables Container of parameters to set in the algorithm
- * 
+ *
  * @return int Number of variables actually set
  */
   int SURFAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) {
 
     SURFPtr v_ref = m_algorithm.dynamicCast<SURFType>();
     int nset(0);
-    if ( variables.exists("HessianThreshold") ) { 
+    if ( variables.exists("HessianThreshold") ) {
       v_ref->setHessianThreshold(toDouble(variables.get("HessianThreshold")));
       nset++;
     }
 
-    if ( variables.exists("NOctaves") ) { 
+    if ( variables.exists("NOctaves") ) {
       v_ref->setNOctaves(toInt(variables.get("NOctaves")));
       nset++;
     }
 
-    if ( variables.exists("NOctaveLayers") ) { 
+    if ( variables.exists("NOctaveLayers") ) {
       v_ref->setNOctaveLayers(toInt(variables.get("NOctaveLayers")));
       nset++;
     }
 
-    if ( variables.exists("Extended") ) { 
+    if ( variables.exists("Extended") ) {
       v_ref->setExtended(toBool(variables.get("Extended")));
       nset++;
     }
 
-    if ( variables.exists("Upright") ) { 
+    if ( variables.exists("Upright") ) {
       v_ref->setUpright(toBool(variables.get("Upright")));
       nset++;
     }
@@ -184,4 +170,3 @@ namespace Isis {
   }
 
 };
-
diff --git a/isis/src/control/apps/findfeatures/SURFAlgorithm.h b/isis/src/control/apps/findfeatures/SURFAlgorithm.h
index 5de47cdbd0ce8798d00cc762c5b43ce319eb7012..142ea41b4c801d1304ff12797f70284bd46c0f74 100644
--- a/isis/src/control/apps/findfeatures/SURFAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/SURFAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef SURFAlgorithm_h
 #define SURFAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 #include "opencv2/xfeatures2d.hpp"
@@ -30,17 +18,17 @@
 namespace Isis {
 
 /**
- * @brief SURF Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 SURF Feature2D algortithm. Only the 
- * necessary methods are implemented here. 
- *  
- * The SURF algorithm is in the contrib portion of the OpenCV 3 API.  
- *  
+ * @brief SURF Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 SURF Feature2D algortithm. Only the
+ * necessary methods are implemented here.
+ *
+ * The SURF algorithm is in the contrib portion of the OpenCV 3 API.
+ *
  * @author  2016-11-30 Kris Becker
- *  
- * @internal 
- *   @history 2016-11-30 Kris Becker - Original Version 
+ *
+ * @internal
+ *   @history 2016-11-30 Kris Becker - Original Version
  */
 
 class SURFAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
diff --git a/isis/src/control/apps/findfeatures/ScalingTransform.cpp b/isis/src/control/apps/findfeatures/ScalingTransform.cpp
index ffdeb210a29ad6d3176e6be1066429e4a32cb1b0..4c10bab39fde998c22cc5c15420a9d32539be128 100644
--- a/isis/src/control/apps/findfeatures/ScalingTransform.cpp
+++ b/isis/src/control/apps/findfeatures/ScalingTransform.cpp
@@ -1,27 +1,10 @@
-/**                                                                       
- * @file                                                                  
- * $Revision$
- * $Date$
- * $Id$
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */ 
+/** This is free and unencumbered software released into the public domain.
 
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -33,25 +16,25 @@
 
 namespace Isis {
 
-ScalingTransform::ScalingTransform() : ImageTransform("ScaleTransform"), 
+ScalingTransform::ScalingTransform() : ImageTransform("ScaleTransform"),
                                        m_scale(1.0) { }
 
-ScalingTransform::ScalingTransform(const double &scale, const QString &name) : 
+ScalingTransform::ScalingTransform(const double &scale, const QString &name) :
                                    ImageTransform(name), m_scale(scale) { }
-                                                  
+
 
 /**
  * @brief Implementation of scaling transform
- *  
+ *
  * @author 2014-07-02 Kris Becker
- * 
+ *
  * @param scale   Scale to apply to source image
  * @param source  Input images to apply transform to
- * 
+ *
  * @return cv::Mat Returns the scaled image
  */
 cv::Mat ScalingTransform::render(const cv::Mat &image) const {
-  cv::Size dstSize(static_cast<int>(image.cols * m_scale + 0.5), 
+  cv::Size dstSize(static_cast<int>(image.cols * m_scale + 0.5),
                    static_cast<int>(image.rows * m_scale + 0.5));
   cv::Mat scaled;
   cv::resize(image, scaled, dstSize, cv::INTER_AREA);
diff --git a/isis/src/control/apps/findfeatures/ScalingTransform.h b/isis/src/control/apps/findfeatures/ScalingTransform.h
index 19b477d4065c642205586399b7ac28a8b9dd820a..16ff3ef00fe114a94ca8f32409fdc8abcbccbb9d 100644
--- a/isis/src/control/apps/findfeatures/ScalingTransform.h
+++ b/isis/src/control/apps/findfeatures/ScalingTransform.h
@@ -1,26 +1,13 @@
 #ifndef ScalingTransform_h
 #define ScalingTransform_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 #include <QSharedPointer>
@@ -35,27 +22,27 @@ namespace Isis {
 
 /**
  * @brief Scale an image size up or down
- *  
- *  
- * @author 2014-07-01 Kris Becker 
- * @internal 
- *   @history 2014-07-01 Kris Becker - Original Version 
+ *
+ *
+ * @author 2014-07-01 Kris Becker
+ * @internal
+ *   @history 2014-07-01 Kris Becker - Original Version
  */
 
   class ScalingTransform : public ImageTransform {
     public:
       ScalingTransform();
-      ScalingTransform(const double &scale, 
-                       const QString &name = "ScaleTransform"); 
+      ScalingTransform(const double &scale,
+                       const QString &name = "ScaleTransform");
       virtual ~ScalingTransform() { }
-  
+
       virtual cv::Mat render(const cv::Mat &image) const;
       virtual cv::Point2f forward(const cv::Point2f &point) const;
       virtual cv::Point2f inverse(const cv::Point2f &point) const;
-  
+
     private:
       double m_scale;
-  
+
   };
 
 }  // namespace Isis
diff --git a/isis/src/control/apps/findfeatures/ScharrTransform.h b/isis/src/control/apps/findfeatures/ScharrTransform.h
index 059198531a5b88fdecb9cd6a570d40eb367b3bc1..b958c7c01e197053087e4d2a51359151484e34fd 100644
--- a/isis/src/control/apps/findfeatures/ScharrTransform.h
+++ b/isis/src/control/apps/findfeatures/ScharrTransform.h
@@ -1,26 +1,14 @@
 #ifndef ScharrTransform_h
 #define ScharrTransform_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QString>
 #include <QSharedPointer>
@@ -34,12 +22,12 @@ namespace Isis {
 
 /**
  * @brief Apply a Sobel transform the image
- *  
+ *
  *  @see
  *       http://docs.opencv.org/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.html
- *  
- * @author 2015-10-14 Kris Becker 
- * @internal 
+ *
+ * @author 2015-10-14 Kris Becker
+ * @internal
  *   @history 2015-10-14 Kris Becker - Original Version
  *   @history 2017-06-22 Jesse Mapel - Modified render to make a deep copy of
  *                                     the input matrix. References #4904.
@@ -47,9 +35,9 @@ namespace Isis {
 
 class ScharrTransform : public ImageTransform {
   public:
-    ScharrTransform() : ImageTransform("ScharrTransform"), m_reduceNoise(true) { } 
-    ScharrTransform(const QString &name, const bool reduceNoise = true) : 
-                   ImageTransform(name), m_reduceNoise(reduceNoise) { } 
+    ScharrTransform() : ImageTransform("ScharrTransform"), m_reduceNoise(true) { }
+    ScharrTransform(const QString &name, const bool reduceNoise = true) :
+                   ImageTransform(name), m_reduceNoise(reduceNoise) { }
     virtual ~ScharrTransform() { }
 
 
@@ -57,11 +45,11 @@ class ScharrTransform : public ImageTransform {
      * Perform the transformation on an image matrix. If the reduce noise flag
      * is set, then this will apply a Gaussian filter with a 3x3 kernel prior
      * to performing the Scharr transformation.
-     * 
+     *
      * @param image The input image data matrix to transform.
-     * 
+     *
      * @return @b cv::Mat The transformed matrix.
-     * 
+     *
      * @note If the reduce noise flag is set, this method creates a deep copy
      *       of the image data matrix which may consume a large amount of memory.
      */
@@ -79,7 +67,7 @@ class ScharrTransform : public ImageTransform {
       cv::Mat src;
       if ( m_reduceNoise ) {
         src = image.clone();
-        cv::GaussianBlur(src, src, cv::Size(3, 3), 0, 0, cv::BORDER_REFLECT ); 
+        cv::GaussianBlur(src, src, cv::Size(3, 3), 0, 0, cv::BORDER_REFLECT );
       }
       else {
         src = image;
@@ -90,11 +78,11 @@ class ScharrTransform : public ImageTransform {
       cv::Mat abs_grad_x, abs_grad_y;
 
       /// Gradient X
-      cv::Scharr( src, grad_x, ddepth, 1, 0, scale, delta, cv::BORDER_REFLECT ); 
+      cv::Scharr( src, grad_x, ddepth, 1, 0, scale, delta, cv::BORDER_REFLECT );
       cv::convertScaleAbs( grad_x, abs_grad_x );
 
       /// Gradient Y
-      cv::Scharr( src, grad_y, ddepth, 0, 1, scale, delta, cv::BORDER_REFLECT ); 
+      cv::Scharr( src, grad_y, ddepth, 0, 1, scale, delta, cv::BORDER_REFLECT );
       cv::convertScaleAbs( grad_y, abs_grad_y );
 
       /// Total Gradient (approximate)
diff --git a/isis/src/control/apps/findfeatures/SobelTransform.h b/isis/src/control/apps/findfeatures/SobelTransform.h
index 8842a8c6b5dbbbb51592d4f4702ad06fe0b97780..b7c7d70292da6b1a1dde00b16e13883614c20768 100644
--- a/isis/src/control/apps/findfeatures/SobelTransform.h
+++ b/isis/src/control/apps/findfeatures/SobelTransform.h
@@ -1,26 +1,14 @@
 #ifndef SobelTransform_h
 #define SobelTransform_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QString>
 #include <QSharedPointer>
@@ -34,33 +22,33 @@ namespace Isis {
 
 /**
  * @brief Apply a Sobel transform the image
- *  
- * @see 
+ *
+ * @see
  *      http://docs.opencv.org/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.html
- *  
- * @author 2015-10-14 Kris Becker 
- * @internal 
- *   @history 2015-10-14 Kris Becker - Original Version 
+ *
+ * @author 2015-10-14 Kris Becker
+ * @internal
+ *   @history 2015-10-14 Kris Becker - Original Version
  *   @history 2017-06-22 Jesse Mapel - Modified render to make a deep copy of
  *                                     the input matrix. References #4904.
  */
 
 class SobelTransform : public ImageTransform {
   public:
-    SobelTransform() : ImageTransform("SobelTransform"), m_reduceNoise(true) { } 
-    SobelTransform(const QString &name, const bool reduceNoise = true) : 
-                   ImageTransform(name), m_reduceNoise(reduceNoise) { } 
+    SobelTransform() : ImageTransform("SobelTransform"), m_reduceNoise(true) { }
+    SobelTransform(const QString &name, const bool reduceNoise = true) :
+                   ImageTransform(name), m_reduceNoise(reduceNoise) { }
     virtual ~SobelTransform() { }
 
     /**
      * Perform the transformation on an image matrix. If the reduce noise flag
      * is set, then this will apply a Gaussian filter with a 3x3 kernel prior
      * to performing the Sobel transformation.
-     * 
+     *
      * @param image The input image data matrix to transform.
-     * 
+     *
      * @return @b cv::Mat The transformed matrix.
-     * 
+     *
      * @note If the reduce noise flag is set, this method creates a deep copy
      *       of the image data matrix which may consume a large amount of memory.
      */
@@ -78,7 +66,7 @@ class SobelTransform : public ImageTransform {
       cv::Mat src;
       if ( m_reduceNoise ) {
         src = image.clone();
-        cv::GaussianBlur(src, src, cv::Size(3, 3), 0, 0, cv::BORDER_REFLECT ); 
+        cv::GaussianBlur(src, src, cv::Size(3, 3), 0, 0, cv::BORDER_REFLECT );
       }
       else {
         src = image;
diff --git a/isis/src/control/apps/findfeatures/StarAlgorithm.cpp b/isis/src/control/apps/findfeatures/StarAlgorithm.cpp
index 1dd0be0267d20f7eac2e3a083bf642061a9fce7d..e1798424eee86f1544877ed43aad8cb1508cf200 100644
--- a/isis/src/control/apps/findfeatures/StarAlgorithm.cpp
+++ b/isis/src/control/apps/findfeatures/StarAlgorithm.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <boost/foreach.hpp>
 #include "opencv2/opencv.hpp"
@@ -33,7 +20,7 @@ namespace Isis {
   /**
    * Constructs the algorithm with default variables.
    */
-  StarAlgorithm::StarAlgorithm() : 
+  StarAlgorithm::StarAlgorithm() :
                  Feature2DAlgorithm("Star", "Feature2D",
                                     StarType::create()) {
     setupParameters();
@@ -42,13 +29,13 @@ namespace Isis {
 
   /**
    * Constructs the algorithm with the input variables
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
    */
   StarAlgorithm::StarAlgorithm(const PvlFlatMap &cvars, const QString &config) :
-                 Feature2DAlgorithm("Star", "Feature2D", 
+                 Feature2DAlgorithm("Star", "Feature2D",
                                      StarType::create(), cvars) {
     setConfig(config);
     PvlFlatMap variables = setupParameters();
@@ -59,7 +46,7 @@ namespace Isis {
     const int lineThresholdBinarized = toInt(variables.get("LineThresholdBinarized"));
     const int SuppressNonmaxSize = toInt(variables.get("SuppressNonmaxSize"));
 
-    m_algorithm = StarType::create(maxSize, responseThreshold, lineThresholdProjected, 
+    m_algorithm = StarType::create(maxSize, responseThreshold, lineThresholdProjected,
                                    lineThresholdBinarized, SuppressNonmaxSize);
 
     m_variables.merge(variables);
@@ -73,9 +60,9 @@ namespace Isis {
 
 
   /**
-   * Sets up the algorithm parameters with default values. 
-   * 
-   * @return PvlFlatMap Algorithm parameters and their default values. 
+   * Sets up the algorithm parameters with default values.
+   *
+   * @return PvlFlatMap Algorithm parameters and their default values.
    */
   PvlFlatMap StarAlgorithm::setupParameters() {
     PvlFlatMap variables;
@@ -91,7 +78,7 @@ namespace Isis {
 
   /**
    * Returns a description of the algorithm.
-   * 
+   *
    * @return @b QString A description of the algorithm.
    */
   QString StarAlgorithm::description() const {
@@ -104,7 +91,7 @@ namespace Isis {
 
   /**
    * Creates an instance of the algorithm.
-   * 
+   *
    * @param cvars  The variables and values the algorithm will use.
    *               Variables that are not included will be set to their default.
    * @param config The config string used to construct cvars.
@@ -116,38 +103,38 @@ namespace Isis {
 
 
   /**
-   * Returns true if the algorithm has a detector. 
-   *  
-   * @return @b true if the algorithm has a detector. 
+   * Returns true if the algorithm has a detector.
+   *
+   * @return @b true if the algorithm has a detector.
    */
-  bool StarAlgorithm::hasDetector() const { 
-    return true; 
+  bool StarAlgorithm::hasDetector() const {
+    return true;
   }
 
 
   /**
-   * Returns true if the algorithm has an extractor. 
-   *  
-   * @return @b true if the algorithm has an extractor. 
+   * Returns true if the algorithm has an extractor.
+   *
+   * @return @b true if the algorithm has an extractor.
    */
-  bool StarAlgorithm::hasExtractor() const { 
-    return false; 
+  bool StarAlgorithm::hasExtractor() const {
+    return false;
   }
 
 
   /**
-   * Returns true if the algorithm has a matcher. 
-   *  
-   * @return @b true if the algorithm has a matcher. 
+   * Returns true if the algorithm has a matcher.
+   *
+   * @return @b true if the algorithm has a matcher.
    */
-  bool StarAlgorithm::hasMatcher() const { 
-    return false; 
+  bool StarAlgorithm::hasMatcher() const {
+    return false;
   }
 
 
   /**
    * Returns the variables and their values used by the algorithm.
-   * 
+   *
    * @return @b PvlFlatMap The variables and their values as keyword, value pairs.
    */
   PvlFlatMap StarAlgorithm::getAlgorithmVariables( ) const {
@@ -157,11 +144,11 @@ namespace Isis {
 
  /**
   * @brief Set parameters as provided by the variables
-  * 
+  *
   * @param variables Container of parameters to set
-  * 
+  *
   * @return @b int Always -1, variables cannot be set after initialization.
-  * 
+  *
   * @throws IException::Programmer "StarAlgorithm does not have the ability
   *                                 to set algorithm parameters."
   */
diff --git a/isis/src/control/apps/findfeatures/StarAlgorithm.h b/isis/src/control/apps/findfeatures/StarAlgorithm.h
index bfb91d2e1cd7a8175feafee919338272d1c92087..aca8ba51742b3d5be0662d6e9b9757d8dd624cda 100644
--- a/isis/src/control/apps/findfeatures/StarAlgorithm.h
+++ b/isis/src/control/apps/findfeatures/StarAlgorithm.h
@@ -1,26 +1,14 @@
 #ifndef StarAlgorithm_h
 #define StarAlgorithm_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FeatureAlgorithm.h"
 #include <QVariant>
@@ -28,15 +16,15 @@
 namespace Isis {
 
 /**
- * @brief StarDetector Feature matcher algorithm 
- *  
- * This class provides the OpenCV3 StarDetector Feature2D algortithm. Only the 
- * necesary methods are implemented here. 
- *  
+ * @brief StarDetector Feature matcher algorithm
+ *
+ * This class provides the OpenCV3 StarDetector Feature2D algortithm. Only the
+ * necesary methods are implemented here.
+ *
  * @author  2016-12-12 Jesse Mapel
- *  
- * @internal 
- *   @history 2016-12-12 Jesse Mapel - Original Version 
+ *
+ * @internal
+ *   @history 2016-12-12 Jesse Mapel - Original Version
  */
 
 class StarAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
@@ -44,7 +32,7 @@ class StarAlgorithm : public Feature2DAlgorithm {  // See FeatureAlgorithm.h
   public:
     StarAlgorithm();
     StarAlgorithm(const PvlFlatMap &cvars, const QString &config = QString() );
-  
+
     virtual ~StarAlgorithm();
 
     QString description() const;
diff --git a/isis/src/control/apps/findfeatures/Transformer.cpp b/isis/src/control/apps/findfeatures/Transformer.cpp
index 973b5aaef808cc438f5da6b19674a55d08d4b1b2..df020d66c085dbf589142de91c41967cc344e76c 100644
--- a/isis/src/control/apps/findfeatures/Transformer.cpp
+++ b/isis/src/control/apps/findfeatures/Transformer.cpp
@@ -1,26 +1,10 @@
-/**                                                                       
- * @file                                                                  
- * $Revision$
- * $Date$
- * $Id$
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */ 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 
 #include <string>
@@ -53,12 +37,12 @@ int Transformer::size() const {
 }
 
 /**
- * @brief Add a transform to the list 
- *  
- * Caller supplies a pointer to an image transform and inherits ownership of the 
- * pointer. The pointers are stored in a shared pointer to memory management is 
- * handled automatically. 
- * 
+ * @brief Add a transform to the list
+ *
+ * Caller supplies a pointer to an image transform and inherits ownership of the
+ * pointer. The pointers are stored in a shared pointer to memory management is
+ * handled automatically.
+ *
  * @param transform Pointer to add to list
  */
 void Transformer::add(ImageTransform *transform) {
@@ -67,13 +51,13 @@ void Transformer::add(ImageTransform *transform) {
 }
 
 /**
- * @brief Apply image transforms to an image 
- *  
- * The incoming image is rendered in each transform, apply the results of the 
- * previous transform to the next transform. 
- * 
+ * @brief Apply image transforms to an image
+ *
+ * The incoming image is rendered in each transform, apply the results of the
+ * previous transform to the next transform.
+ *
  * @param image  Image to transform
- * @return cv::Mat Final result of all image transforms 
+ * @return cv::Mat Final result of all image transforms
  */
 cv::Mat Transformer::render(const cv::Mat &image) const {
   cv::Mat t_image = image;
@@ -84,11 +68,11 @@ cv::Mat Transformer::render(const cv::Mat &image) const {
 }
 
 /**
- * @brief Convert a point coordinate applied in each transform 
- *  
- * The point passed into this method has the forward point transform of each 
- * ImageTransform applied to result in the final coordinate. 
- * 
+ * @brief Convert a point coordinate applied in each transform
+ *
+ * The point passed into this method has the forward point transform of each
+ * ImageTransform applied to result in the final coordinate.
+ *
  * @param point        Point to transform with the transform list
  * @return cv::Point2f Transformed point coordinate
  */
@@ -101,14 +85,14 @@ cv::Point2f Transformer::forward(const cv::Point2f &point) const {
 }
 
 /**
- * @brief Convert the inverse of the point from the list of imaage tranforms 
- *  
- * The given point is assumed to have been appled with the forward() method, 
- * and modified or computed in the final transform data space. This method 
- * converts the coordinates back the the original coordinate system (typically 
- * raw image space) by traversing the list in reverse and applying the inverse 
- * point conversion method. 
- *  
+ * @brief Convert the inverse of the point from the list of imaage tranforms
+ *
+ * The given point is assumed to have been appled with the forward() method,
+ * and modified or computed in the final transform data space. This method
+ * converts the coordinates back the the original coordinate system (typically
+ * raw image space) by traversing the list in reverse and applying the inverse
+ * point conversion method.
+ *
  * @param point        Point to invert
  * @return cv::Point2f Resulting inverted point
  */
diff --git a/isis/src/control/apps/findfeatures/Transformer.h b/isis/src/control/apps/findfeatures/Transformer.h
index c5e12f72e6d3593cec7da59431c858ddde3c3a8f..aba3855f0d8e7a74fc64c0ed70f6d16637ca45d8 100644
--- a/isis/src/control/apps/findfeatures/Transformer.h
+++ b/isis/src/control/apps/findfeatures/Transformer.h
@@ -1,26 +1,14 @@
 #ifndef Transformer_h
 #define Transformer_h
-/**
- * @file
- * $Revision$ 
- * $Date$ 
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QList>
 #include <QString>
@@ -35,41 +23,41 @@ namespace Isis {
 
 /**
  * @brief Provide a series of image transforms
- *  
- * This class serves as a container class for all image transformations and 
+ *
+ * This class serves as a container class for all image transformations and
  * point conversions, both forward and inverse.
- *  
- * As each image is read, the list of transforms are applied for each transform 
- * added to the this class. There is typically a list of transforms for each 
- * image. 
- *  
- * @author 2015-10-03 Kris Becker 
- * @internal 
- *   @history 2015-10-03 Kris Becker - Original Version 
- *   @history 2016-04-05 Kris Becker Completed documentation 
+ *
+ * As each image is read, the list of transforms are applied for each transform
+ * added to the this class. There is typically a list of transforms for each
+ * image.
+ *
+ * @author 2015-10-03 Kris Becker
+ * @internal
+ *   @history 2015-10-03 Kris Becker - Original Version
+ *   @history 2016-04-05 Kris Becker Completed documentation
  */
 
   class Transformer {
     public:
       typedef ImageTransformQList::iterator       ImageTransformIterator;
       typedef ImageTransformQList::const_iterator ImageTransformConstIterator;
-  
+
       Transformer();
       virtual ~Transformer();
-  
+
       int size() const;
-  
+
       void add(ImageTransform *transform);
       cv::Mat render(const cv::Mat &image) const;
-  
+
       cv::Point2f forward(const cv::Point2f &point) const;
       cv::Point2f inverse(const cv::Point2f &point) const;
-  
+
       ImageTransformConstIterator begin() const;
       ImageTransformConstIterator end() const;
-  
+
       void clear();
-      
+
     private:
       ImageTransformQList m_transforms;  //!<  List of transforms
   };
diff --git a/isis/src/control/apps/findfeatures/findfeatures.cpp b/isis/src/control/apps/findfeatures/findfeatures.cpp
index 2df8ef32eafe7e36b6d63e8d907a00c7cb90b909..5ef5ff0038c3ebb070266e2e3da762d4a7674539 100644
--- a/isis/src/control/apps/findfeatures/findfeatures.cpp
+++ b/isis/src/control/apps/findfeatures/findfeatures.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <ctime>
 /*#define USE_GUI_QAPP 1*/
diff --git a/isis/src/control/apps/findfeatures/findfeatures.h b/isis/src/control/apps/findfeatures/findfeatures.h
index 55c39ffbce934b69f12c6e68a494e9318ad0685e..16f481b9178a09a6c2993dde5e544df3614f4e45 100644
--- a/isis/src/control/apps/findfeatures/findfeatures.h
+++ b/isis/src/control/apps/findfeatures/findfeatures.h
@@ -1,6 +1,14 @@
 #ifndef findfeatures_h
 #define findfeatures_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 #include "Pvl.h"
 
diff --git a/isis/src/control/apps/findfeatures/main.cpp b/isis/src/control/apps/findfeatures/main.cpp
index 62dc2464edc9087b07ed24c4a66dc1e1266c64a8..dd75cdc0e5fc82b1857192c04103244f5ba5da93 100644
--- a/isis/src/control/apps/findfeatures/main.cpp
+++ b/isis/src/control/apps/findfeatures/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
diff --git a/isis/src/control/apps/fplanemap/main.cpp b/isis/src/control/apps/fplanemap/main.cpp
index fc65e88ae5cb557b90f27d99dfed58b436c566ed..50a005f5ef0da78b56d043859d4318c1f7719889 100644
--- a/isis/src/control/apps/fplanemap/main.cpp
+++ b/isis/src/control/apps/fplanemap/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "PvlGroup.h"
 #include "UserInterface.h"
@@ -30,7 +38,7 @@ struct Coordinate {
   double longitude;    //!< Longitude of the point
 };
 
-inline double distance(const double &x1, const double &y1, 
+inline double distance(const double &x1, const double &y1,
                        const double &x2, const double &y2) {
   return (sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1)));
 }
@@ -136,14 +144,14 @@ void IsisMain() {
       else nulls++;
     }
     else {
-       badPoint++; 
+       badPoint++;
     }
     prog.CheckStatus();
   }
 
   PvlGroup results("Results");
-  results += PvlKeyword("PixelPitch", toString(pp), "millimeters");  
-  results += PvlKeyword("TotalPoints", toString(cn.GetNumPoints()));  
+  results += PvlKeyword("PixelPitch", toString(pp), "millimeters");
+  results += PvlKeyword("TotalPoints", toString(cn.GetNumPoints()));
   results += PvlKeyword("ValidPoints", toString((BigInt) coords.size()));
   results += PvlKeyword("InvalidPoints", toString(badPoint));
   if (checkForNulls) results += PvlKeyword("NullDNs", toString(nulls));
@@ -170,7 +178,7 @@ void IsisMain() {
     for(unsigned int i = 0; i < coords.size(); i++) {
       Coordinate &c = coords[i];
       os << c.samp << "," << c.line << "," << c.errSamp << "," << c.errLine << ","
-         << c.olddetX << "," << c.olddetY << "," << c.newdetX << "," << c.newdetY << "," 
+         << c.olddetX << "," << c.olddetY << "," << c.newdetX << "," << c.newdetY << ","
          << c.gof << "," << c.latitude << "," << c.longitude << endl;
 
     }
@@ -178,4 +186,3 @@ void IsisMain() {
 
   return;
 }
-
diff --git a/isis/src/control/apps/jigsaw/jigsaw.cpp b/isis/src/control/apps/jigsaw/jigsaw.cpp
index c01dd195f997f7dc4ad3ffb29856b250dd7f6df7..6038368ef2dcf822350f84b117789a19fed78b69 100644
--- a/isis/src/control/apps/jigsaw/jigsaw.cpp
+++ b/isis/src/control/apps/jigsaw/jigsaw.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 
 #include <QDir>
diff --git a/isis/src/control/apps/jigsaw/jigsaw.h b/isis/src/control/apps/jigsaw/jigsaw.h
index 955c11dc712b94feed65853132c71691c25871fb..04c0110f107144d71061b302b24122eab04b94fa 100644
--- a/isis/src/control/apps/jigsaw/jigsaw.h
+++ b/isis/src/control/apps/jigsaw/jigsaw.h
@@ -1,6 +1,14 @@
 #ifndef jigsaw_h
 #define jigsaw_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <vector>
 
 #include <QString>
diff --git a/isis/src/control/apps/jigsaw/main.cpp b/isis/src/control/apps/jigsaw/main.cpp
index 785b680d30ff9ba84278e7a8e153f5d304c35b1f..f457e6ed6819909408f9c922a8b1cd61462a2867 100644
--- a/isis/src/control/apps/jigsaw/main.cpp
+++ b/isis/src/control/apps/jigsaw/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "jigsaw.h"
diff --git a/isis/src/control/apps/mat2cnet/main.cpp b/isis/src/control/apps/mat2cnet/main.cpp
index 519cef17fe65818d7bddd09fd6eb8732ccbd4f0f..00fbbaf827c790ea0b7a5fce19594324b364f920 100644
--- a/isis/src/control/apps/mat2cnet/main.cpp
+++ b/isis/src/control/apps/mat2cnet/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <map>
diff --git a/isis/src/control/apps/pointreg/main.cpp b/isis/src/control/apps/pointreg/main.cpp
index d9bdff1659d21592ce0eaf5c08168c76a04d63cf..799c4d1c425f53873f78efc51d6559e1abfb6740 100644
--- a/isis/src/control/apps/pointreg/main.cpp
+++ b/isis/src/control/apps/pointreg/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
diff --git a/isis/src/control/apps/pointreg/pointreg.cpp b/isis/src/control/apps/pointreg/pointreg.cpp
index 63cd2cf2dc2cd7fa239567ab2aaaf3d5b60cd9ec..f85cea14359d6bf28dd3c8cee2b15743d27266f3 100644
--- a/isis/src/control/apps/pointreg/pointreg.cpp
+++ b/isis/src/control/apps/pointreg/pointreg.cpp
@@ -1,3 +1,10 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <sys/resource.h>
 
@@ -731,7 +738,7 @@ namespace Isis {
     double searchRes = getResolution(searchCube, *reference);
     validation.compareResolutions(patternRes, searchRes, resTolerance);
 
-    if (validation.skipped()) 
+    if (validation.skipped())
       return validation;
 
     validator->SearchChip()->TackCube(
diff --git a/isis/src/control/apps/pointreg/pointreg.h b/isis/src/control/apps/pointreg/pointreg.h
index 70fa85b9afd8f3642a8925928eb86f4ef925f3d6..43972f047657ee1b0bb0ae73da912b4a68176bd2 100644
--- a/isis/src/control/apps/pointreg/pointreg.h
+++ b/isis/src/control/apps/pointreg/pointreg.h
@@ -1,6 +1,14 @@
 #ifndef pointreg_h
 #define pointreg_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 #include "Pvl.h"
 
diff --git a/isis/src/control/apps/seedgrid/main.cpp b/isis/src/control/apps/seedgrid/main.cpp
index 8b99f0727549975df2f0911b9fa73b8b9ab3ee16..88cb7e10822489f0cfadf95d7563944419834c4b 100644
--- a/isis/src/control/apps/seedgrid/main.cpp
+++ b/isis/src/control/apps/seedgrid/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #define GUIHELPERS
 
 #include "Isis.h"
diff --git a/isis/src/control/apps/slither/ControlByRow.h b/isis/src/control/apps/slither/ControlByRow.h
index fd1cbd97591b1f960d674b57704ae6c32c2737e0..3b0fc13bc2391abec53f07b6f318098940d601e7 100644
--- a/isis/src/control/apps/slither/ControlByRow.h
+++ b/isis/src/control/apps/slither/ControlByRow.h
@@ -1,27 +1,13 @@
 #ifndef ControlByRow_h
 #define ControlByRow_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2007/01/30 22:12:21 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 #include "ControlMeasure.h"
diff --git a/isis/src/control/apps/slither/SlitherTransform.cpp b/isis/src/control/apps/slither/SlitherTransform.cpp
index 7a81b58b4e0efba07ef4baa02f88ac04a02b0ab0..572448cb0347e57968c3ab85dfb604fe446227de 100644
--- a/isis/src/control/apps/slither/SlitherTransform.cpp
+++ b/isis/src/control/apps/slither/SlitherTransform.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <fstream>
 #include <iostream>
diff --git a/isis/src/control/apps/slither/SlitherTransform.h b/isis/src/control/apps/slither/SlitherTransform.h
index 4577fa254b8a0ba0d51e68d943d825a3fa37cb3b..3e2c9b687d8a5e29ca7532ffb32e10619f37b85c 100644
--- a/isis/src/control/apps/slither/SlitherTransform.h
+++ b/isis/src/control/apps/slither/SlitherTransform.h
@@ -1,6 +1,14 @@
 #ifndef SlitherTransform_h
 #define SlitherTransform_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <vector>
 #include <fstream>
 #include <iostream>
@@ -305,5 +313,3 @@ namespace Isis {
 
 }
 #endif
-
-
diff --git a/isis/src/control/apps/slither/main.cpp b/isis/src/control/apps/slither/main.cpp
index 9f0daaa68ee1a86a76c4e887547aee8d9e785736..6dcf03c6cbfe55f230ae14f77123046e6e8bc930 100644
--- a/isis/src/control/apps/slither/main.cpp
+++ b/isis/src/control/apps/slither/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <fstream>
@@ -95,4 +103,3 @@ void IsisMain() {
   p.EndProcess();
   delete interp;
 }
-
diff --git a/isis/src/control/apps/sumspice/SumFile.cpp b/isis/src/control/apps/sumspice/SumFile.cpp
index 7283c33722a7a86f5da010763986d23c4a191d42..5e5d727acba8ba0c40ced7f711c8865e1b4ac391 100644
--- a/isis/src/control/apps/sumspice/SumFile.cpp
+++ b/isis/src/control/apps/sumspice/SumFile.cpp
@@ -1,26 +1,10 @@
-/**                                                                       
- * @file                                                                  
- * $Revision: 6565 $
- * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $
- * $Id: SumFile.cpp 6565 2016-02-11 00:15:35Z kbecker@GS.DOI.NET $
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */ 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "SumFile.h"
 
@@ -49,66 +33,66 @@ using namespace std;
 
 namespace Isis {
 
-  /** 
+  /**
    *  Default constructor creates empty SumFile object.
    */
   SumFile::SumFile()  { }
-  
+
 
   /**
-   * @brief Constructor reads and parses contents of SUMFILE 
-   *  
+   * @brief Constructor reads and parses contents of SUMFILE
+   *
    * @param sumFile Name of SUMFILE to read/parse
    */
   SumFile::SumFile(const QString &sumFile) {
     parseSumFile(sumFile);
   }
-  
-  
-//  /** 
+
+
+//  /**
 //   *  Tests vailidty of the SumFile point.
-//   *  
+//   *
 //   *  @return @b bool
 //   */
 //  bool SumFile::isValid() const {
-//    return (true); 
+//    return (true);
 //  }
-  
 
-  /** 
+
+  /**
    *  Returns the name of the SUMFILE (contents of first line).
-   *  
+   *
    *  @return @b QString Name of sumfile identifier
    */
   QString SumFile::name() const {
     return (m_id);
-  
+
   }
-  
 
-  /** 
+
+  /**
    *  Returns the time found in the SUMFILE in UTC form
-   *  
+   *
    *  @return @b QString Time found in SUMFILE
    */
   QString SumFile::utc() const {
     return (m_obsTime.UTC());
-  
+
   }
-  
 
-  /** 
+
+  /**
    *  Returns the SUMFILE time, in ET.
-   *  
+   *
    *  @return @b double Time converted to ET
    */
   double  SumFile::et() const {
     return (m_obsTime.Et());
   }
-  
+
 /**
- * @brief Returns the Time object found in SUMFILE 
- * 
+ * @brief Returns the Time object found in SUMFILE
+ *
  * @return const iTime& Time in SUMFILE
  */
   const iTime &SumFile::time() const {
@@ -116,16 +100,16 @@ namespace Isis {
   }
 
 /**
- * @brief Update SPICE data in ISIS cube 
- *  
- * This method will update the SPICE blobs with the contents of the SUMSPICE. 
- * The contents of the InstrumentPosition will be replaced with SUMSPICE SZ 
+ * @brief Update SPICE data in ISIS cube
+ *
+ * This method will update the SPICE blobs with the contents of the SUMSPICE.
+ * The contents of the InstrumentPosition will be replaced with SUMSPICE SZ
  * vector and InstrumentPointing is replaced by the CX, CY, CZ matrix.
- * 
+ *
  * @param cube    An intialized ISIS Cube object
- * @param camera  An option pointer to the camera. If not provided, it is 
+ * @param camera  An option pointer to the camera. If not provided, it is
  *                retrieved from the Cube object
- * 
+ *
  * @return bool   True if succesful, false if the operation fails
  */
   bool SumFile::updateSpice(Cube &cube, Camera *camera) const {
@@ -135,21 +119,21 @@ namespace Isis {
     }
     return (good);
   }
-  
-  
+
+
   /**
-   * @brief Convert the SUMFILE contents and apply pointing to ISIS camera 
-   *  
-   * It is up to the caller to ensure appropriate kernels are loaded. See 
-   * loadKernels(); 
-   * 
+   * @brief Convert the SUMFILE contents and apply pointing to ISIS camera
+   *
+   * It is up to the caller to ensure appropriate kernels are loaded. See
+   * loadKernels();
+   *
    * @param cube    Cube to update pointing for
    * @param camera  Camera object associated with cube for update
-   * 
+   *
    * @return bool  True if successful, false otherwise
    */
   bool SumFile::updatePointing(Cube &cube, Camera *camera) const {
-  
+
     Camera *mycam = ( camera != NULL ) ? camera : cube.camera();
 
     // get new pointing quaternion from sum file
@@ -162,13 +146,13 @@ namespace Isis {
     SpiceRotation *oldRotation = mycam->instrumentRotation();
     Quaternion oldConstantRotation(oldRotation->ConstantRotation()); // old TC rotation
 
-    // Get the new rotation from the sum file. 
+    // Get the new rotation from the sum file.
     // this is the instrument frame (relative to the target, i.e. body-fixed)
     Quaternion newRotation = getPointing();
 
     // new target to instrument rotation (TC) is found by
     //     TC = inverse(rotation from sum file) * (old TC rotation)
-    // 
+    //
     // So, the new instrument frame relative to J2000 is
     //     CJ = inverse(TC) * TJ
     Quaternion newTimeBasedRotation = oldConstantRotation.Conjugate() * newRotation * j2000ToTarget; // new CJ
@@ -180,7 +164,7 @@ namespace Isis {
                      toString(table.Records()) + " for file " + cube.fileName();
       throw IException(IException::User, message, _FILEINFO_);
     }
-  
+
     TableRecord &rec0 = table[0];
     if ( rec0.Fields() < 5 ) {
       QString message = "Expected/support quaternion Table containing 5 or more fields "
@@ -192,35 +176,35 @@ namespace Isis {
     for (int i = 0; i < 4; i++) {
       rec0[i] = newTimeBasedRotation[i];
     }
-  
+
     // Put a comment in the record
     QString message = "Updated pointing with SUMFILE " + name() + " on " + iTime::CurrentLocalTime();
     PvlKeyword sumFileKeyword("SUMFILE", name());
     sumFileKeyword.addComment(message);
     table.Label().addKeyword(sumFileKeyword, PvlContainer::Replace);
     table.Update(rec0, 0);
-  
+
     cube.write(table);
-  
+
     // Delete polygon if it has one
     if ( cube.label()->hasObject("Polygon") ) {
       cube.label()->deleteObject("Polygon");
     }
-  
+
     return (true);
   }
-  
+
 
   /**
    * @brief Update spacecraft position with SUMFILE data
-   * 
+   *
    * @param cube    Cube to update position for
    * @param camera  Camera object associated with cube for update
-   * 
+   *
    * @return bool   True if successful, false otherwise
    */
   bool SumFile::updatePosition(Cube &cube, Camera *camera) const {
-  
+
     Camera *mycam = ( !camera ) ? cube.camera() : camera;
 
     SpiceRotation *body = mycam->bodyRotation();
@@ -233,17 +217,17 @@ namespace Isis {
     vminus_c(&spacecraftPos[0], &spacecraftPos[0]);
     // Transform position vector from body-fixed to J2000
     spacecraftPos = j2000ToTarget.Conjugate().Qxv(spacecraftPos);
-  
+
     // Retrieve s/c cache and update the position
     SpicePosition *oldPosition = mycam->instrumentPosition();
     Table table = oldPosition->Cache("InstrumentPosition");
     if ( table.Records() > 1 ) {
-      QString message = "Expected/support only one InstrumentPosition record " 
+      QString message = "Expected/support only one InstrumentPosition record "
                      "(i.e., Framing camera) but got " +
                      toString(table.Records()) + " for file " + cube.fileName();
       throw IException(IException::User, message, _FILEINFO_);
     }
-  
+
     TableRecord &rec0 = table[0];
     if ( rec0.Fields() < 4 ) {
       QString message = "Expected/support vector Table containing 4 or more fields "
@@ -256,35 +240,35 @@ namespace Isis {
     for (unsigned int i = 0; i < spacecraftPos.size(); i++) {
       rec0[i] = spacecraftPos[i];
     }
-  
-    // Put a comment in the record 
+
+    // Put a comment in the record
     QString message = "Updated position with SUMFILE " + name() + " on " + iTime::CurrentLocalTime();
     PvlKeyword sumFileKeyword("SUMFILE", name());
     sumFileKeyword.addComment(message);
     table.Label().addKeyword(sumFileKeyword, PvlContainer::Replace);
     table.Update(rec0, 0);
-  
+
     cube.write(table);
-  
+
     // Delete polygon if it has one
     if ( cube.label()->hasObject("Polygon") ) {
       cube.label()->deleteObject("Polygon");
     }
-  
+
     return (true);
-  
+
    }
-  
+
 
 
   /**
-   * @brief Return the point matrix, in body-fixed format. 
-   *  
-   * This method will return a quaternion, in body fixed coordinates, 
+   * @brief Return the point matrix, in body-fixed format.
+   *
+   * This method will return a quaternion, in body fixed coordinates,
    * corresponding to the 3x3 instrument pointing matrix found in the SUMFILE.
-   * Note that there is no need to load kernels (or have transformations 
-   * determined) to provide this data. 
-   * 
+   * Note that there is no need to load kernels (or have transformations
+   * determined) to provide this data.
+   *
    * @return Quaternion The SUMFILE's pointing matrix
    */
   Quaternion SumFile::getPointing() const {
@@ -300,14 +284,14 @@ namespace Isis {
     Quaternion quaternionBodyFixed(cmatrixBodyFixed);
     return quaternionBodyFixed;
   }
-  
+
 
   /**
    * @brief Get spacecraft postion in body-fixed coordinates
-   *  
-   * This method will return the vector found in the SUMFILE that represents 
-   * the coordinates of the spacecraft, in body fixed position. 
-   * 
+   *
+   * This method will return the vector found in the SUMFILE that represents
+   * the coordinates of the spacecraft, in body fixed position.
+   *
    * @return std::vector<double> The SUMFILE's spacecraft position
    */
   std::vector<double> SumFile::getPosition()  const{
@@ -318,15 +302,15 @@ namespace Isis {
     spacecraftPosition.push_back(m_spacecraftPosition[2]);
     return (spacecraftPosition);
   }
-  
+
 
 
   /**
    * @brief Get Sun postion in body-fixed coordinates
-   *  
-   * This method will return the vector found in the SUMFILE that represents 
-   * the coordinates of the Sun, in body fixed position. 
-   * 
+   *
+   * This method will return the vector found in the SUMFILE that represents
+   * the coordinates of the Sun, in body fixed position.
+   *
    * @return std::vector<double> The SUMFILE's Sun position
    */
   std::vector<double> SumFile::getSunPosition()  const{
@@ -337,31 +321,31 @@ namespace Isis {
     sunPosition.push_back(m_sunPosition[2]);
     return (sunPosition);
   }
-  
+
 
   /**
-   * Adds information about the SUMFILE to the output stream: name, start time 
-   * (UTC), start time (ET), number of lines, number of samples, DN minimum, DN 
-   * maximum. 
-   *  
+   * Adds information about the SUMFILE to the output stream: name, start time
+   * (UTC), start time (ET), number of lines, number of samples, DN minimum, DN
+   * maximum.
+   *
    * @param outs The output Stream to be filled.
-   * 
+   *
    * @return @b std::ostream& The filled output stream.
    */
   std::ostream &SumFile::brief(std::ostream &outs) const {
-    outs << name() << ", " << utc() << ", "  << std::fixed << et() << ", " 
-         << m_numLines << ", " << m_numSamples 
+    outs << name() << ", " << utc() << ", "  << std::fixed << et() << ", "
+         << m_numLines << ", " << m_numSamples
          << ", " << m_dnMin << ", " << m_dnMax;
-    return (outs); 
+    return (outs);
   }
-  
+
 
   /**
    * @brief Opens and parses the contents of a SUMFILE.
-   *  
-   * THis method will open a Gaskell SPC SUMFILE and parse the contents. The 
-   * SUMFILE contents are internalized in the SumFile object. 
-   * 
+   *
+   * THis method will open a Gaskell SPC SUMFILE and parse the contents. The
+   * SUMFILE contents are internalized in the SumFile object.
+   *
    * @param sumFile Name of a SPC SUMFILE
    */
   void SumFile::parseSumFile(const QString &sumFile) {
@@ -371,127 +355,127 @@ namespace Isis {
       QString message = "Failed to open FROM file \"" + sfile.original() + "\"";
       throw IException(IException::User, message, _FILEINFO_);
     }
-  
+
     // Open the text stream
     QTextStream sumin(&sumF);
-  
+
     // Get the image id
     QStringList values = getSumLine(sumin.readLine(), 1);
     m_id  = values.first();
-  
+
     // Get the time. We expect spaces in the time specification
     values = getSumLine(sumin.readLine(), 4);
     m_obsTime = iTime(values.join("-"));
-  
+
     // Get image lines/samples and lower/upper dn boundaries
     values = getSumLine(sumin.readLine(), 7, "THRSH");
     m_numSamples = cvtDouble(values[0]);
     m_numLines = cvtDouble(values[1]);
     m_dnMin  = cvtDouble(values[2]);
     m_dnMax  = cvtDouble(values[3]);
-  
+
     // Get pixel size and boresight line/sample
     values = getSumLine(sumin.readLine(), 5, "CTR");
     m_pxlSize = cvtDouble(values[0]);
     m_centerSample   = cvtDouble(values[1]);
     m_centerLine   = cvtDouble(values[2]);
-  
+
     // Get spacecraft position
     values = getSumLine(sumin.readLine(), 4, "SCOBJ");
     for (int i = 0; i < 3; i++) {
       m_spacecraftPosition[i] = cvtDouble(values[i]);
     }
-  
+
     // Get X component of pointing matrix
     values = getSumLine(sumin.readLine(), 4, "CX");
     for (int i = 0; i < 3; i++) m_pointingMatrix[0][i] = cvtDouble(values[i]);
-  
+
     // Get Y component of pointing matrix
     values = getSumLine(sumin.readLine(), 4,"CY");
     for (int i = 0; i < 3; i++) m_pointingMatrix[1][i] = cvtDouble(values[i]);
-  
+
     // Get Z component of pointing matrix
     values = getSumLine(sumin.readLine(), 4, "CZ");
     for (int i = 0; i < 3; i++) m_pointingMatrix[2][i] = cvtDouble(values[i]);
-  
-  
+
+
     // Get sun position
     values = getSumLine(sumin.readLine(), 4, "SZ");
     for (int i = 0; i < 3; i++) m_sunPosition[i] = cvtDouble(values[i]);
-  
+
     // Get K-matrix
     values = getSumLine(sumin.readLine(), 7, "K-MATRIX");
     for (int i = 0; i < 6; i++) m_kmatrix[i] = cvtDouble(values[i]);
-  
+
     // Get distortion parameters or SIGPXL values.
     values = getSumLine(sumin.readLine(), 0);
-  
+
     if ( values.last() == "DISTORTION" ) {
-      for (int i = 0; i < 4; i++) m_distortion[i] = cvtDouble(values[i]); 
+      for (int i = 0; i < 4; i++) m_distortion[i] = cvtDouble(values[i]);
     }
-  
+
     // Get formal spacecraft position uncertainty
     values = getSumLine(sumin.readLine(), 4, "SIGMA_VSO");
     for (int i = 0; i < 3; i++) m_sigmaSCPos[i] = cvtDouble(values[i]);
-  
-  
+
+
     // Get formal pointing uncertainty
     values = getSumLine(sumin.readLine(), 4, "SIGMA_PTG");
     for (int i = 0; i < 3; i++) m_sigmaSCPos[i] = cvtDouble(values[i]);
-  
+
     // Should be at the landmarks line in the file now.  This test ensures it
     values = getSumLine(sumin.readLine(), 1, "LANDMARKS");
-  
-    // Read all landmarks (ControlMeasures) in this section until we encounter 
+
+    // Read all landmarks (ControlMeasures) in this section until we encounter
     //limb fits...
-  
+
     // Read to end of file
     while ( !sumin.atEnd() ) {
       values = getSumLine(sumin.readLine());
     }
-  
+
    return;
   }
-  
+
 
   /**
    * @brief Get referred input line from SUMFILE line
-   *  
-   * This method will tokenize a simple string with optional error checking for 
-   * known line content. The string is expected to be line of a Gaskell SUMFILE. 
-   *  
-   * Each data string has control characters removed, commas converted to spaces 
-   * and multiple spaces compressed to a single space. The string is then 
-   * tokenized with each value separated by a space. 
-   *  
-   * Callers can use the nexpected parameter to ensure the expected fields are 
-   * read from the input stream. If 0, it will accept any number of tokens 
-   * (including 0). If the expected number of tokens are not met, an exception is 
-   * thrown to indicate unexpected input. 
-   *  
-   * The tag parameter is provided to check for a specific value in the last 
-   * column of a parsed SUMFILE line. The tag string is compared to the last 
-   * field string parsed from the processed input data string using a case 
-   * insensitve comparison. If the values are not equivalent, an exception is 
-   * thrown. If a value is not provided, this check is not applied. 
-   *  
-   * @param data       Line from a Gaskell SUMFILE 
-   * @param nexpected  Optional number of columns/fields after tokenization. a 
+   *
+   * This method will tokenize a simple string with optional error checking for
+   * known line content. The string is expected to be line of a Gaskell SUMFILE.
+   *
+   * Each data string has control characters removed, commas converted to spaces
+   * and multiple spaces compressed to a single space. The string is then
+   * tokenized with each value separated by a space.
+   *
+   * Callers can use the nexpected parameter to ensure the expected fields are
+   * read from the input stream. If 0, it will accept any number of tokens
+   * (including 0). If the expected number of tokens are not met, an exception is
+   * thrown to indicate unexpected input.
+   *
+   * The tag parameter is provided to check for a specific value in the last
+   * column of a parsed SUMFILE line. The tag string is compared to the last
+   * field string parsed from the processed input data string using a case
+   * insensitve comparison. If the values are not equivalent, an exception is
+   * thrown. If a value is not provided, this check is not applied.
+   *
+   * @param data       Line from a Gaskell SUMFILE
+   * @param nexpected  Optional number of columns/fields after tokenization. a
    *                   value of 0 will not apply this check.
-   * @param tag        If specified, is the expect string in last column of a 
+   * @param tag        If specified, is the expect string in last column of a
    *                   parsed SUMFILE line. String comparison is case
    *                   insensitive.
-   * 
+   *
    * @return QStringList List of tokenized string fields
    */
-  QStringList SumFile::getSumLine(const QString &data, const int &nexpected, 
+  QStringList SumFile::getSumLine(const QString &data, const int &nexpected,
                                   const QString &tag) const {
-  
+
     // Copy string and parse results
     QString line = data.simplified();
     line.replace(",", " ");
     QStringList values = line.split(" ", QString::SkipEmptyParts);
-  
+
     if ( nexpected > 0 ) {
       if ( values.size() != nexpected ) {
         QString message = "Expected " + toString(nexpected) + " but got "
@@ -499,12 +483,12 @@ namespace Isis {
         throw IException(IException::User, message, _FILEINFO_);
       }
     }
-  
+
     // Check for tags
     if ( !tag.isEmpty() ) {
       if ( values.size() > 0 ) {
         if ( values.last().toLower() != tag.toLower() ) {
-          QString message = "Expected line tag given (" + tag + 
+          QString message = "Expected line tag given (" + tag +
                          ") does not match contents (" + values.last() + ")";
           throw IException(IException::User, message, _FILEINFO_);
         }
@@ -514,21 +498,21 @@ namespace Isis {
         throw IException(IException::User, message, _FILEINFO_);
       }
     }
-  
+
     return (values);
   }
-  
+
 
   /**
-   * @brief Convert text to double value 
-   *  
+   * @brief Convert text to double value
+   *
    * This method will convert special forms of double text value formats to binary
-   * form. It is particulary useful when handle text of the form 2.440D+3". This 
-   * format is not directly supported by conversion facilities.  The "D" is 
-   * converted to "e" in these cases. 
-   *  
+   * form. It is particulary useful when handle text of the form 2.440D+3". This
+   * format is not directly supported by conversion facilities.  The "D" is
+   * converted to "e" in these cases.
+   *
    * @param value Text value to convert
-   * 
+   *
    * @return double Converted text value
    */
   double SumFile::cvtDouble(const QString &value) const {
@@ -538,14 +522,14 @@ namespace Isis {
 
 
   /**
-   * @brief Load a list of SUMFILEs from a file 
-   *  
-   * This static method loads a list of SUMFILEs contained in a file. Each line in 
-   * the file is assumsed to be a SUMFILE and will be initialized using a new 
-   * SumFile object for each file contained in the list. 
-   * 
+   * @brief Load a list of SUMFILEs from a file
+   *
+   * This static method loads a list of SUMFILEs contained in a file. Each line in
+   * the file is assumsed to be a SUMFILE and will be initialized using a new
+   * SumFile object for each file contained in the list.
+   *
    * @param sumFiles     Name of file containing SUMFILEs
-   * 
+   *
    * @return SumFileList List of SumFile objects created from SUMFILE list
    */
   SumFileList loadSumFiles(const FileList &sumFiles) {
@@ -553,17 +537,15 @@ namespace Isis {
     progress.SetText("Loading Sum File List");
     progress.SetMaximumSteps(sumFiles.size());
     SumFileList sum_list;
-  
+
     for (int f = 0; f < sumFiles.size(); f++) {
       progress.CheckStatus();
       SharedSumFile sumF(new SumFile(sumFiles[f].original()));
       sum_list.append(sumF);
     }
-  
+
     return (sum_list);
   }
 
 }
 // namespace Isis
-
-
diff --git a/isis/src/control/apps/sumspice/SumFile.h b/isis/src/control/apps/sumspice/SumFile.h
index 23d3e92f558993cf409f68869836f4a5a77c893a..c0b75f4305ba99d43346c282738ff861d09020a2 100644
--- a/isis/src/control/apps/sumspice/SumFile.h
+++ b/isis/src/control/apps/sumspice/SumFile.h
@@ -1,26 +1,14 @@
 #ifndef SumFile_h
 #define SumFile_h
-/**
- * @file
- * $Revision: 6565 $
- * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <ostream>
 #include <cfloat>
 #include <cmath>
@@ -41,44 +29,44 @@ namespace Isis {
 
   /**
    * @brief Container for a Gaskell SUMFILE
-   *  
-   * This class will parse the contents of a R. Gaskell SUMFILE used in his 
-   * stereo photoclinometry (SPC) system and provide access to the elements that 
+   *
+   * This class will parse the contents of a R. Gaskell SUMFILE used in his
+   * stereo photoclinometry (SPC) system and provide access to the elements that
    * are stored therein.
-   * 
+   *
    * @author 2015-02-02 Kris Becker
-   * 
+   *
    * @internal
-   *   @history 2015-02-02 Kris Becker Original Version 
-   *   @history 2016-02-09 Kris Becker - Updated documentation 
-   *   @history 2016-06-07 Kris Becker - Renamed getIlluminationPosition() to 
+   *   @history 2015-02-02 Kris Becker Original Version
+   *   @history 2016-02-09 Kris Becker - Updated documentation
+   *   @history 2016-06-07 Kris Becker - Renamed getIlluminationPosition() to
    *                           getSunPosition(). updateIlluminationPosition() did
    *                           not have an implementation so it was removed.
-   *   @history 2016-09-14 Kris Becker - Moved updateTimes() to new SumFinder 
+   *   @history 2016-09-14 Kris Becker - Moved updateTimes() to new SumFinder
    *                           class as there is not enough information to do it
    *                           correctly in SumFile.
    */
   class SumFile {
     public:
-      
+
       SumFile();
       SumFile(const QString &sumfile);
       virtual ~SumFile() { }
-  
+
       bool isValid() const;
       QString name() const;
       QString utc() const;
       double  et() const;
       const iTime &time() const;
-  
+
       bool updateSpice(Cube &cube, Camera *camera = 0) const;
       bool updatePointing(Cube &cube, Camera *camera = 0) const;
       bool updatePosition(Cube &cube, Camera *camera = 0) const;
-  
+
       Quaternion getPointing() const;
       std::vector<double> getPosition() const;
       std::vector<double> getSunPosition()  const;
-  
+
       std::ostream &brief(std::ostream &outs) const;
 
     private:
@@ -91,7 +79,7 @@ namespace Isis {
       double  m_pxlSize;
       double  m_centerSample;
       double  m_centerLine;
-  
+
       double  m_spacecraftPosition[3];
       double  m_pointingMatrix[3][3];
       double  m_sunPosition[3];
@@ -100,23 +88,23 @@ namespace Isis {
       double  m_sigmaSCPos[3];
       double  m_sigmaPntg[3];
       // QList<ControlMeasure>   m_measures;
-  
+
       void parseSumFile(const QString &sumfile);
-      QStringList getSumLine(const QString &data, const int &nexpected = 0, 
+      QStringList getSumLine(const QString &data, const int &nexpected = 0,
                              const QString &tag = "") const;
       double cvtDouble(const QString &value) const;
-  
+
       Quaternion getBFtoJ2000(Camera *camera) const;
       Quaternion getFrameRotation(const int &fromId, const int &toId,
                                   const double &timeEt) const;
       QString    getFrameName(const int &frameid) const;
       int        getFrameCode(const QString &frameName) const;
-  
+
   };
-  
-  ///!<   Shared Resource pointer that everyone can use 
+
+  ///!<   Shared Resource pointer that everyone can use
   typedef QSharedPointer<SumFile> SharedSumFile;
-  
+
   ///!<  Define a resource list
   typedef QList<SharedSumFile> SumFileList;
 
@@ -127,15 +115,15 @@ namespace Isis {
 
   /**
    * @brief Ascending order sort functor
-   * 
+   *
    * This is a comparison class used to sort lists of SharedSumFile objects, in
-   * ascending order.  Two shared sum files are passed in and the ephemeris 
-   * times of each is compared using the less than operator. 
-   * 
+   * ascending order.  Two shared sum files are passed in and the ephemeris
+   * times of each is compared using the less than operator.
+   *
    * @author 2015-07-28 Kris Becker
-   * 
+   *
    * @internal
-   *   @history 2015-07-28 Kris Becker Original Version 
+   *   @history 2015-07-28 Kris Becker Original Version
    */
   class SortEtAscending {
     public:
diff --git a/isis/src/control/apps/sumspice/SumFinder.cpp b/isis/src/control/apps/sumspice/SumFinder.cpp
index a22d418e65f6b47fa87465ccef52b87a29381c66..9b0b372730c755646b32f4a353945b7909b83552 100644
--- a/isis/src/control/apps/sumspice/SumFinder.cpp
+++ b/isis/src/control/apps/sumspice/SumFinder.cpp
@@ -1,26 +1,10 @@
-/**
- * @file
- * $Revision: 6565 $
- * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $
- * $Id: SumFile.cpp 6565 2016-02-11 00:15:35Z kbecker@GS.DOI.NET $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "SumFinder.h"
 
diff --git a/isis/src/control/apps/sumspice/SumFinder.h b/isis/src/control/apps/sumspice/SumFinder.h
index 7c635efa2c0f03d4a9a4e864f79a3720a5c92939..5a1588bbe118e5ee537c49130db6b16df313880e 100644
--- a/isis/src/control/apps/sumspice/SumFinder.h
+++ b/isis/src/control/apps/sumspice/SumFinder.h
@@ -1,26 +1,14 @@
 #ifndef SumFinder_h
 #define SumFinder_h
-/**
- * @file
- * $Revision: 6565 $
- * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <ostream>
 #include <cfloat>
 #include <cmath>
diff --git a/isis/src/control/apps/sumspice/main.cpp b/isis/src/control/apps/sumspice/main.cpp
index c18d2fe36f407bbe5b7ec96d795acd74ae7e1861..e487256447b4f34e4d5b52f191082220a758713e 100644
--- a/isis/src/control/apps/sumspice/main.cpp
+++ b/isis/src/control/apps/sumspice/main.cpp
@@ -1,3 +1,12 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
+
 // $Id: sumspice.cpp 6565 2016-02-11 00:15:35Z kbecker@GS.DOI.NET $
 #include "Isis.h"
 
diff --git a/isis/src/control/apps/warp/WarpTransform.cpp b/isis/src/control/apps/warp/WarpTransform.cpp
index 82f6561a00d7f875434a3afd03f6967c3e9db442..ee8b64cf4d644e42d41c8c1900c67189b47c43bf 100644
--- a/isis/src/control/apps/warp/WarpTransform.cpp
+++ b/isis/src/control/apps/warp/WarpTransform.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <iostream>
 
diff --git a/isis/src/control/apps/warp/WarpTransform.h b/isis/src/control/apps/warp/WarpTransform.h
index bd91d0f88f7e478de6f3fdc5d1730e5ee3226b29..eafab048772c69339af9e798258eb04fbc0bebd6 100644
--- a/isis/src/control/apps/warp/WarpTransform.h
+++ b/isis/src/control/apps/warp/WarpTransform.h
@@ -1,6 +1,14 @@
 #ifndef WarpTransform_h
 #define WarpTransform_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <vector>
 #include "Transform.h"
 #include "BasisFunction.h"
@@ -41,5 +49,3 @@ namespace Isis {
 
 }
 #endif
-
-
diff --git a/isis/src/control/apps/warp/main.cpp b/isis/src/control/apps/warp/main.cpp
index f456a88f5cd35ddbc45904571652b1fe37a43b8a..9e142498c360c3762c951dc749c1fb5adbc21f29 100644
--- a/isis/src/control/apps/warp/main.cpp
+++ b/isis/src/control/apps/warp/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <fstream>
@@ -111,4 +119,3 @@ void IsisMain() {
   delete basisLine;
   delete basisSamp;
 }
-
diff --git a/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp b/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp
index 852693e65932df1cb182a6088a3925d5f58fbf58..2c8696cd30ab65e0e4d1468540fe077592ba749e 100644
--- a/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp
+++ b/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleAdjust.h"
 
 // std lib
@@ -3062,7 +3070,7 @@ namespace Isis {
     std::ostringstream ostr;
     ostr << summaryGroup << std::endl;
     m_iterationSummary += QString::fromStdString( ostr.str() );
-    
+
     if (m_printSummary && iApp != NULL) {
       Application::Log(summaryGroup);
     }
diff --git a/isis/src/control/objs/BundleAdjust/BundleAdjust.h b/isis/src/control/objs/BundleAdjust/BundleAdjust.h
index bdb9afbaa9ab79784f0459a6be75ef56e2461257..1fcf848fa513fa2e7d7ecde2d6667711e35f084f 100644
--- a/isis/src/control/objs/BundleAdjust/BundleAdjust.h
+++ b/isis/src/control/objs/BundleAdjust/BundleAdjust.h
@@ -1,29 +1,14 @@
 #ifndef BundleAdjust_h
 #define BundleAdjust_h
 
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2009/10/15 01:35:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
-// Qt lib
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QObject> // parent class
 
 // std lib
diff --git a/isis/src/control/objs/BundleAdjust/unitTest.cpp b/isis/src/control/objs/BundleAdjust/unitTest.cpp
index 7b797b55549c854026e2cb74c1c7f1d6fac36c40..1f3855ecbc636e6875986b3dbe3c8d5cd3777d8b 100644
--- a/isis/src/control/objs/BundleAdjust/unitTest.cpp
+++ b/isis/src/control/objs/BundleAdjust/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 
 #include "BundleAdjust.h"
@@ -42,7 +50,7 @@ Errors:
  void BundleAdjust::init(Progress *progress) {
     (image==false) for BundleImage* image = new BundleImage(camera, serialNumber, fileName);
           QString msg = "In BundleAdjust::init(): image " + fileName + "is null" + "\n";
-    (observation==false) for BundleObservation *observation = m_bundleObservations.addNew(image, observationNumber, instrumentId, m_bundleSettings);            
+    (observation==false) for BundleObservation *observation = m_bundleObservations.addNew(image, observationNumber, instrumentId, m_bundleSettings);
           QString msg = "In BundleAdjust::init(): observation " + observationNumber + "is null" + "\n";
 
 
diff --git a/isis/src/control/objs/BundleResults/BundleResults.cpp b/isis/src/control/objs/BundleResults/BundleResults.cpp
index 3d7c1d295402d2177b1e40b1996cd26637cb9d7e..f8d3447f49292c2b2a9023f0f49fc5f5f63e9844 100644
--- a/isis/src/control/objs/BundleResults/BundleResults.cpp
+++ b/isis/src/control/objs/BundleResults/BundleResults.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleResults.h"
 
 #include <QDataStream>
diff --git a/isis/src/control/objs/BundleResults/BundleResults.h b/isis/src/control/objs/BundleResults/BundleResults.h
index 3fd2b27e0d44521cff2bd937b00a9770308b87ab..0e4c75b96b10b315e69609293efb4000854fe61c 100644
--- a/isis/src/control/objs/BundleResults/BundleResults.h
+++ b/isis/src/control/objs/BundleResults/BundleResults.h
@@ -1,28 +1,14 @@
 #ifndef BundleResults_h
 #define BundleResults_h
 
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2009/10/15 01:35:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // Qt Library
 #include <QList>
 #include <QObject>
@@ -85,12 +71,12 @@ namespace Isis {
    *   @history 2017-04-24 Ian Humphrey - Removed pvlObject() method. Commented out m_id serialization
    *                           for save() (causes segfault in unit test for empty xml). Fixes #4797.
    *   @history 2017-04-27 J Bonn - Updated serialization code and tests.
-   *   @history 2017-05-30 Debbie A. Cook - Corrected class names in method comments and generalized 
-   *                            control point coordinate names.  Methods changed:  copy constructor, 
+   *   @history 2017-05-30 Debbie A. Cook - Corrected class names in method comments and generalized
+   *                            control point coordinate names.  Methods changed:  copy constructor,
    *                            assignment operator, initialize,  Also added access methods for coordinate types.
    *                            References #4649 and #501.
-   *   @history 2018-09-30 Debbie A. Cook - Removed methods setRadiansToMeters and 
-   *                            radiansToMeters and member variable m_radiansToMeters.  References #4649 
+   *   @history 2018-09-30 Debbie A. Cook - Removed methods setRadiansToMeters and
+   *                            radiansToMeters and member variable m_radiansToMeters.  References #4649
    *                            and #501.
    */
   class BundleResults : public QObject {
@@ -208,7 +194,7 @@ namespace Isis {
       double sigmaCoord1StatisticsRms() const;
       double sigmaCoord2StatisticsRms() const;
       double sigmaCoord3StatisticsRms() const;
-      
+
       double rmsRx() const;  // currently unused ???
       double rmsRy() const;  // currently unused ???
       double rmsRxy() const; // currently unused ???
@@ -324,9 +310,9 @@ namespace Isis {
       double m_elapsedTime;                    //!< elapsed time for bundle
       double m_elapsedTimeErrorProp;           //!< elapsed time for error propagation
       bool m_converged;
-      
+
       // Variables for output methods in BundleSolutionInfo
-      
+
       QVector<BundleControlPointQsp> m_bundleControlPoints; /**< The vector of BundleControlPoints
                                                                  from BundleAdjust.  Equivalent to
                                                                  the output control net minus
diff --git a/isis/src/control/objs/BundleResults/unitTest.cpp b/isis/src/control/objs/BundleResults/unitTest.cpp
index fb3d05fd19b6095d7493a25fb32d6d9035fc560e..543730ea904aaa928f5853531718a4ff8a0197aa 100755
--- a/isis/src/control/objs/BundleResults/unitTest.cpp
+++ b/isis/src/control/objs/BundleResults/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QByteArray>
 #include <QDataStream>
 #include <QDebug>
diff --git a/isis/src/control/objs/BundleSettings/BundleSettings.cpp b/isis/src/control/objs/BundleSettings/BundleSettings.cpp
index 0a674971495bcff6c6df0e185cbf601644b0caea..5d59ee3d680b33952ef032545e5fb1c569939385 100644
--- a/isis/src/control/objs/BundleSettings/BundleSettings.cpp
+++ b/isis/src/control/objs/BundleSettings/BundleSettings.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleSettings.h"
 
 #include <QDataStream>
@@ -264,13 +272,13 @@ namespace Isis {
                                        bool solveRadius,
                                        SurfacePoint::CoordinateType coordTypeBundle,
                                        SurfacePoint::CoordinateType coordTypeReports,
-                                       double globalPointCoord1AprioriSigma, 
-                                       double globalPointCoord2AprioriSigma, 
+                                       double globalPointCoord1AprioriSigma,
+                                       double globalPointCoord2AprioriSigma,
                                        double globalPointCoord3AprioriSigma) {
     m_solveObservationMode = solveObservationMode;
     m_solveRadius = solveRadius;
     m_updateCubeLabel = updateCubeLabel;
-    m_errorPropagation = errorPropagation;      
+    m_errorPropagation = errorPropagation;
     m_cpCoordTypeReports = coordTypeReports;
     m_cpCoordTypeBundle = coordTypeBundle;
     // m_cpCoordTypeBundle = SurfacePoint::Latitudinal;
@@ -471,8 +479,8 @@ namespace Isis {
 
 
   /**
-   * Retrieves global a priori sigma for 1st coordinate of points for this bundle 
-   * 
+   * Retrieves global a priori sigma for 1st coordinate of points for this bundle
+   *
    * @return @b double The global a priori sigma for point coordinate 1.
    */
   double BundleSettings::globalPointCoord1AprioriSigma() const {
@@ -482,7 +490,7 @@ namespace Isis {
 
   /**
    * Retrieves the global a priori sigma for 2nd coordinate of points for this bundle
-   * 
+   *
    * @return @b double The global a priori sigma for point coordinate 2.
    */
   double BundleSettings::globalPointCoord2AprioriSigma() const {
@@ -491,8 +499,8 @@ namespace Isis {
 
 
   /**
-   * Retrieves the global a priori sigma 3rd coordinate of points for this bundle 
-   * 
+   * Retrieves the global a priori sigma 3rd coordinate of points for this bundle
+   *
    * @return @b double The global a priori sigma for point coordinate 3.
    */
   double BundleSettings::globalPointCoord3AprioriSigma() const {
@@ -512,8 +520,8 @@ namespace Isis {
 
 
   /**
-   * Retrieves solve settings for the observation corresponding to the given observation number. 
-   * If no corresponding settings object exists, return a new solve settings with no related 
+   * Retrieves solve settings for the observation corresponding to the given observation number.
+   * If no corresponding settings object exists, return a new solve settings with no related
    * observation numbers.
    *
    * @param observationNumber The observation number associated with the
@@ -570,7 +578,7 @@ namespace Isis {
    */
   QList<BundleObservationSolveSettings> BundleSettings::observationSolveSettings() const {
     return m_observationSolveSettings;
-  } 
+  }
 
 
   // =============================================================================================//
diff --git a/isis/src/control/objs/BundleSettings/BundleSettings.h b/isis/src/control/objs/BundleSettings/BundleSettings.h
index 4b1ab834e98da21861b2ad7223314f183e7bb0ac..7757d5feb229889f9f6061242c0be33f76970dfe 100644
--- a/isis/src/control/objs/BundleSettings/BundleSettings.h
+++ b/isis/src/control/objs/BundleSettings/BundleSettings.h
@@ -1,26 +1,13 @@
 #ifndef BundleSettings_h
 #define BundleSettings_h
 
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // Qt library
 #include <QList>
@@ -110,20 +97,20 @@ namespace Isis {
    *   @history 2018-06-28 Christopher Combs - Added observationSolveSettings() method to retrieve
    *                            m_observationSolveSettings. Fixes #497.
    *
-   *   @history 2017-06-25 Debbie Cook - Added m_cpCoordTypeReports and m_cpCoordTypeBundle. 
-   *                           The 2nd type determines how control point coordinates are entered 
-   *                           into the the matrix and interpreted throughout the adjustment.  The 
+   *   @history 2017-06-25 Debbie Cook - Added m_cpCoordTypeReports and m_cpCoordTypeBundle.
+   *                           The 2nd type determines how control point coordinates are entered
+   *                           into the the matrix and interpreted throughout the adjustment.  The
    *                           1st type determines the coordinate type of control points in reports.
-   *                           Added the new coordinate type as an argument to SetSolveOptions.  
+   *                           Added the new coordinate type as an argument to SetSolveOptions.
    *                           Changed GlobalAprioriSigmas names to more generic names:  Latitude to
    *                           PointCoord1, Longitude to PointCoord2, and Radius to PointCoord3 so
-   *                           they can be used for either lat/lon/radius or x/y/z.  Also added 
+   *                           they can be used for either lat/lon/radius or x/y/z.  Also added
    *                           accessor methods, CoordTypeReports() & CoordTypeBundle()
    *                           for the new coordinate type members.
    *                           References #4649 and #501.
    *   @history 2019-05-17 Tyler Wilson - Added QString m_cubeList member function as well
    *                           as get/set member functions.  References #3267.
-   *  
+   *
    *   @todo Determine which XmlStackedHandlerReader constructor is preferred
    *   @todo Determine which XmlStackedHandler needs a Project pointer (see constructors)
    *   @todo Determine whether QList<BundleObservationSolveSettings> m_observationSolveSettings
@@ -171,10 +158,10 @@ namespace Isis {
                            bool solveRadius = false,
                            SurfacePoint::CoordinateType coordTypeBundle = SurfacePoint::Latitudinal,
                            SurfacePoint::CoordinateType coordTypeReports = SurfacePoint::Latitudinal,
-                           double globalPointCoord1AprioriSigma = Isis::Null, 
-                           double globalPointCoord2AprioriSigma = Isis::Null, 
-                           double globalPointCoord3AprioriSigma = Isis::Null); 
-      void setOutlierRejection(bool outlierRejection, 
+                           double globalPointCoord1AprioriSigma = Isis::Null,
+                           double globalPointCoord2AprioriSigma = Isis::Null,
+                           double globalPointCoord3AprioriSigma = Isis::Null);
+      void setOutlierRejection(bool outlierRejection,
                                double multiplier = 1.0);
       void setObservationSolveOptions(QList<BundleObservationSolveSettings> obsSolveSettingsList);
       void setCreateInverseMatrix(bool createMatrix);
@@ -197,7 +184,7 @@ namespace Isis {
       int numberSolveSettings() const;
       BundleObservationSolveSettings observationSolveSettings(QString instrumentId) const;
       BundleObservationSolveSettings observationSolveSettings(int n) const;
-      QList<BundleObservationSolveSettings> observationSolveSettings() const; 
+      QList<BundleObservationSolveSettings> observationSolveSettings() const;
 
 
       //=====================================================================//
@@ -405,7 +392,7 @@ namespace Isis {
       // Control Points
       SurfacePoint::CoordinateType m_cpCoordTypeReports;  /**< Indicates the coordinate type for
                                                    outputting control points in reports.  */
-      SurfacePoint::CoordinateType m_cpCoordTypeBundle;     /**< Indicates the coordinate type used 
+      SurfacePoint::CoordinateType m_cpCoordTypeBundle;     /**< Indicates the coordinate type used
                                                     for control points in the bundle adjustment */
       // Output Options
       QString m_outputFilePrefix;    /**< The prefix for all output files. If the user does not want
diff --git a/isis/src/control/objs/BundleSettings/unitTest.cpp b/isis/src/control/objs/BundleSettings/unitTest.cpp
index 3dc1caa844fae2bce73f196be91238a8ae589537..bce54ee887b8443339f0214892718e44fda3f534 100755
--- a/isis/src/control/objs/BundleSettings/unitTest.cpp
+++ b/isis/src/control/objs/BundleSettings/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QByteArray>
 #include <QDataStream>
 #include <QDebug>
@@ -49,8 +57,8 @@ void printXml(const T &);
   *                           Fixes #4797.
   *   @history 2018-05-24 Ken Edmundson - Updated truth data to indicate default value for
   *                                       m_createInverseMatrix was changed from true to false.
-  *   @history 2018-06-04 Debbie A. Cook - (added to BundleXYZ branch on 2017-06-25) Updated to 
-  *                           reflect added argument for control pointcoordinate type.  References 
+  *   @history 2018-06-04 Debbie A. Cook - (added to BundleXYZ branch on 2017-06-25) Updated to
+  *                           reflect added argument for control pointcoordinate type.  References
   *                           #4649 and #501.
   *
   *   @todo Truth updated so that the name of the BundleObservationSolveSettings object is Null,
@@ -373,4 +381,3 @@ void printXml(const T &printable) {
   output.remove(QRegExp("<id>[^<]*</id>"));
   qDebug().noquote() << output << endl << endl;
 }
-
diff --git a/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp b/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp
index b96b89926be28281e8162ab8592a91eaa5ae3c73..a818ed20e50f0f1b59c28829e3c5e12b0c7ee7e9 100755
--- a/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp
+++ b/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleSolutionInfo.h"
 
 #include <QDataStream>
diff --git a/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h b/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h
index 2922d12f2f6f913e76331672b6b742b8bdfa8f75..f34e7b3e0d6331362caea8e1beb251b877c47998 100755
--- a/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h
+++ b/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h
@@ -1,26 +1,13 @@
 #ifndef BundleSolutionInfo_h
 #define BundleSolutionInfo_h
 
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QList>
 #include <QObject>
diff --git a/isis/src/control/objs/BundleSolutionInfo/unitTest.cpp b/isis/src/control/objs/BundleSolutionInfo/unitTest.cpp
index 2751b0a09081f88a1c8b260dd931fb16e4fef201..17d0ebf79e88d701d8c9c596413a2b4ca7a0844b 100755
--- a/isis/src/control/objs/BundleSolutionInfo/unitTest.cpp
+++ b/isis/src/control/objs/BundleSolutionInfo/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QByteArray>
 #include <QDataStream>
 #include <QDebug>
diff --git a/isis/src/control/objs/BundleUtilities/BundleControlPoint.cpp b/isis/src/control/objs/BundleUtilities/BundleControlPoint.cpp
index 01ebc9a490f5c8a19e95ca4af38058067feb1912..090d57f98c58dba858e60f9d65312f826f009b58 100644
--- a/isis/src/control/objs/BundleUtilities/BundleControlPoint.cpp
+++ b/isis/src/control/objs/BundleUtilities/BundleControlPoint.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleControlPoint.h"
 
 #include <QDebug>
@@ -17,9 +25,9 @@ namespace Isis {
 
 
   /**
-   * Constructs a BundleControlPoint object from a ControlPoint. Only the 
-   * non-ignored measures are added to the BundleControlPoint. 
-   * @param controlPoint Pointer to a ControlPoint that will be used to 
+   * Constructs a BundleControlPoint object from a ControlPoint. Only the
+   * non-ignored measures are added to the BundleControlPoint.
+   * @param controlPoint Pointer to a ControlPoint that will be used to
    *                     construct this BundleControlPoint.
    */
   BundleControlPoint::BundleControlPoint(const BundleSettingsQsp bundleSettings,
@@ -34,7 +42,7 @@ namespace Isis {
         continue;
       }
 
-      addMeasure(controlMeasure);      
+      addMeasure(controlMeasure);
     }
 
     // initialize to 0.0
@@ -61,9 +69,9 @@ namespace Isis {
 
 
   /**
-   * Copy constructor. Constructs a BundleControlPoint object from an existing 
-   * BundleControlPoint. 
-   *  
+   * Copy constructor. Constructs a BundleControlPoint object from an existing
+   * BundleControlPoint.
+   *
    * @param src The BundleControlPoint to be copied.
    */
   BundleControlPoint::BundleControlPoint(const BundleControlPoint &src) {
@@ -72,22 +80,22 @@ namespace Isis {
 
 
   /**
-   * Destructor for BundleControlPoint. 
+   * Destructor for BundleControlPoint.
    */
   BundleControlPoint::~BundleControlPoint() {
   }
 
 
   /**
-   * Copies given BundleControlPoint to this BundleControlPoint. 
-   *  
+   * Copies given BundleControlPoint to this BundleControlPoint.
+   *
    * @param src The BundleControlPoint to be copied.
    */
   void BundleControlPoint::copy(const BundleControlPoint &src) {
 
     // sanity check
     clear();
-    
+
     m_controlPoint = src.m_controlPoint;
 
     int numMeasures = src.size();
@@ -107,11 +115,11 @@ namespace Isis {
 
 
   /**
-   * Creates a BundleMeasure from the given ControlMeasure and appends it to 
-   * this BundleControlPoint's measure list. 
-   *  
+   * Creates a BundleMeasure from the given ControlMeasure and appends it to
+   * this BundleControlPoint's measure list.
+   *
    * @param controlMeasure The ControlMeasure to be converted.
-   * 
+   *
    * @return @b BundleMeasure* A pointer to the new BundleMeasure.
    */
   BundleMeasureQsp BundleControlPoint::addMeasure(ControlMeasure *controlMeasure) {
@@ -135,8 +143,8 @@ namespace Isis {
 
 
   /**
-   * Sets the adjusted surface point for this BundleControlPoint. 
-   *  
+   * Sets the adjusted surface point for this BundleControlPoint.
+   *
    * @param surfacePoint The surface point to be set.
    */
   void BundleControlPoint::setAdjustedSurfacePoint(SurfacePoint surfacePoint) {
@@ -169,9 +177,9 @@ namespace Isis {
 
 
   /**
-   * Sets the weights using the given BundleSettings QSharedPointer and a 
-   * conversion value for meters to radians. 
-   *  
+   * Sets the weights using the given BundleSettings QSharedPointer and a
+   * conversion value for meters to radians.
+   *
    * @param settings A QSharedPointer to BundleSettings object.
    * @param metersToRadians A double precision conversion factor.
    */
@@ -187,7 +195,7 @@ namespace Isis {
       m_weights[2] = 1.0e+50;
       // m_aprioriSigmas = Isis::Null by default
     }
-    
+
     if (m_controlPoint->GetType() == ControlPoint::Free) {
       // Global sigmas are temporary and should not be stored in the control net.  Currently
       // global sigmas are always in meters.  Make sure unit of weights is 1/(var unit squared),
@@ -207,7 +215,7 @@ namespace Isis {
       }
       else {
         if (!IsSpecial(globalPointCoord3AprioriSigma)) {
-          setSigmaWeightFromGlobals(globalPointCoord3AprioriSigma, 2); 
+          setSigmaWeightFromGlobals(globalPointCoord3AprioriSigma, 2);
         }
       }
     }
@@ -226,7 +234,7 @@ namespace Isis {
              m_controlPoint->GetAprioriSurfacePoint().GetWeight(m_coordTypeBundle, SurfacePoint::One);
       }
       else if (!IsSpecial(globalPointCoord1AprioriSigma)) {
-        setSigmaWeightFromGlobals(globalPointCoord1AprioriSigma, 0); 
+        setSigmaWeightFromGlobals(globalPointCoord1AprioriSigma, 0);
       } // else not constrained and global sigma is Null, then  m_aprioriSigmas = Isis::Null
         // m_weights = 0.0
 
@@ -238,7 +246,7 @@ namespace Isis {
           m_controlPoint->GetAprioriSurfacePoint().GetWeight(m_coordTypeBundle, SurfacePoint::Two);
       }
       else if (!IsSpecial(globalPointCoord2AprioriSigma)) {
-        setSigmaWeightFromGlobals(globalPointCoord2AprioriSigma, 1); 
+        setSigmaWeightFromGlobals(globalPointCoord2AprioriSigma, 1);
       } // else not constrained and global sigma is Null, then  m_aprioriSigmas = Isis::Null
         // m_weights = 0.0
 
@@ -254,7 +262,7 @@ namespace Isis {
             (m_coordTypeBundle, SurfacePoint::Three);
         }
         else if (!IsSpecial(globalPointCoord3AprioriSigma)) {
-          setSigmaWeightFromGlobals(globalPointCoord3AprioriSigma, 2); 
+          setSigmaWeightFromGlobals(globalPointCoord3AprioriSigma, 2);
         } // else not constrained and global sigma is Null, then  m_aprioriSigmas = Isis::Null
           // m_weights = 0.0
       }
@@ -263,18 +271,18 @@ namespace Isis {
 
 
   /**
-   * Sets the member sigmas and weights from a global sigma.. 
-   * 
-// *** TODO *** Should index be SurfacePoint::CoordIndex? 
+   * Sets the member sigmas and weights from a global sigma..
+   *
+// *** TODO *** Should index be SurfacePoint::CoordIndex?
    * @param gSigma The global sigma to assign.
    * @param index The index of the point coordinate being set (0, 1, or 2).
    * @param cFactor The conversion factor applied to gSigma to match bundle variable units.
-   * 
-    * @see formatAprioriSigmaString() 
+   *
+    * @see formatAprioriSigmaString()
    */
-  void BundleControlPoint::setSigmaWeightFromGlobals(double gSigma, int index) {    
+  void BundleControlPoint::setSigmaWeightFromGlobals(double gSigma, int index) {
     m_aprioriSigmas[index] = gSigma;
-    
+
     switch (index) {
       case 0:
         if (m_coordTypeBundle == SurfacePoint::Latitudinal) {
@@ -297,7 +305,7 @@ namespace Isis {
           throw IException(IException::Programmer, msg, _FILEINFO_);
         }
         break;
-      case 1:  
+      case 1:
         // if (!IsSpecial(globalPointCoord2AprioriSigma)) {
         if (m_coordTypeBundle == SurfacePoint::Latitudinal) {
           double sigmaRadians =
@@ -314,9 +322,9 @@ namespace Isis {
           IString msg ="Unknown surface point coordinate type enum ["
             + toString(m_coordTypeBundle) + "]." ;
           throw IException(IException::Programmer, msg, _FILEINFO_);
-        } 
+        }
         break;
-      
+
       case 2:
       // Coordinate 2 is either latitudinal radius or rectangular z, both in m
       {
@@ -324,7 +332,7 @@ namespace Isis {
         m_weights[2] = 1./ (sigmakm*sigmakm); // 1/km^2
         }
         break;
-      
+
       default:
           IString msg ="Unknown coordinate index [" + toString(index) + "]." ;
           throw IException(IException::Programmer, msg, _FILEINFO_);
@@ -358,7 +366,7 @@ namespace Isis {
     QMapIterator< int, LinearAlgebra::Matrix * > Qit(m_cholmodQMatrix);
 
     int subrangeStart, subrangeEnd;
-    
+
     while ( Qit.hasNext() ) {
       Qit.next();
 
@@ -366,7 +374,7 @@ namespace Isis {
 
       subrangeStart = sparseNormals.at(columnIndex)->startColumn();
       subrangeEnd = subrangeStart + Qit.value()->size2();
-      
+
       m_nicVector += alpha * prod(*(Qit.value()),subrange(v1,subrangeStart,subrangeEnd));
     }
   }
@@ -383,10 +391,10 @@ namespace Isis {
                                                SparseBlockMatrix &sparseNormals,
                                                const BundleTargetBodyQsp target) {
     if (!isRejected()) {
-        
+
       // subtract product of Q and nj from NIC
       productAlphaAV(-1.0, sparseNormals, imageSolution);
-        
+
       // update adjusted surface point appropriately for the coordinate type
       switch (m_coordTypeBundle) {
         case SurfacePoint::Latitudinal:
@@ -400,7 +408,7 @@ namespace Isis {
             + toString(m_coordTypeBundle) + "]." ;
             throw IException(IException::Programmer, msg, _FILEINFO_);
       }
-        
+
       // sum and save corrections
       m_corrections(0) += m_nicVector[0];
       m_corrections(1) += m_nicVector[1];
@@ -408,10 +416,10 @@ namespace Isis {
     }
   }
 
-  
+
   /**
    * Accessor for the raw ControlPoint object used for this BundleControlPoint.
-   * 
+   *
    * @return @b ControlPoint* A pointer to the raw ControlPoint.
    */
   ControlPoint *BundleControlPoint::rawControlPoint() const {
@@ -421,7 +429,7 @@ namespace Isis {
 
   /**
    * Method used to determine whether this control point is rejected.
-   * 
+   *
    * @return @b bool Indicates whether this control point is rejected.
    */
   bool BundleControlPoint::isRejected() const {
@@ -431,7 +439,7 @@ namespace Isis {
 
   /**
    * Accesses number of measures associated with this BundleControlPoint.
-   * 
+   *
    * @return @b int The number of measures for this point.
    */
   int BundleControlPoint::numberOfMeasures() const {
@@ -465,7 +473,7 @@ namespace Isis {
 
   /**
    * Accesses the adjusted SurfacePoint associated with this BundleControlPoint.
-   * 
+   *
    * @return @b SurfacePoint The adjusted surface point.
    */
   SurfacePoint BundleControlPoint::adjustedSurfacePoint() const {
@@ -474,8 +482,8 @@ namespace Isis {
 
 
   /**
-   * Accesses the Point ID associated with this BundleControlPoint. 
-   * 
+   * Accesses the Point ID associated with this BundleControlPoint.
+   *
    * @return @b QString The ID for this point.
    */
   QString BundleControlPoint::id() const {
@@ -485,10 +493,10 @@ namespace Isis {
 
   /**
    * Accesses BundleControlPoint's type.
-   * 
+   *
    * @return @b ControlPoint::PointType The BundleControlPoint's type.  Options are:
    *                                    Fixed = 0, Constrained = 1, Free = 2.
-   * 
+   *
    * @see ControlPoint::GetType()
    */
   ControlPoint::PointType BundleControlPoint::type() const{
@@ -498,10 +506,10 @@ namespace Isis {
 
   /**
    * Accesses BundleControlPoint's coordinate type for reports.
-   * 
-   * @return @b ControlPoint::CoordinateType The BundleControlPoint's coordinate type. 
+   *
+   * @return @b ControlPoint::CoordinateType The BundleControlPoint's coordinate type.
    *                                    See SurfacePoint for the options.
-   * 
+   *
    * @see ControlPoint::getCoordType()
    */
   SurfacePoint::CoordinateType BundleControlPoint::coordTypeReports() const{
@@ -511,10 +519,10 @@ namespace Isis {
 
   /**
    * Accesses BundleControlPoint's control point coordinate type for the bundle adjustment.
-   * 
-   * @return @b ControlPoint::CoordinateType The BundleControlPoint's coordinate type. 
+   *
+   * @return @b ControlPoint::CoordinateType The BundleControlPoint's coordinate type.
    *                                    See SurfacePoint for the options.
-   * 
+   *
    * @see ControlPoint::getCoordTypeBundle()
    */
   SurfacePoint::CoordinateType BundleControlPoint::coordTypeBundle() const{
@@ -524,10 +532,10 @@ namespace Isis {
 
 // *** TODO *** Need to add bounded vectors to Linear Algebra class
   /**
-   * Accesses the 3 dimensional ordered vector of correction values associated 
-   * with coord1, coord2, and coord 3 (latitude, longitude, and radius or X, Y, and Z. 
+   * Accesses the 3 dimensional ordered vector of correction values associated
+   * with coord1, coord2, and coord 3 (latitude, longitude, and radius or X, Y, and Z.
    * A bounded vector is recommended because the size will always be 3.
-   * 
+   *
    * @return @b boost::numeric::ublas::bounded_vector<double,3>& The vector of correction values.
    */
   boost::numeric::ublas::bounded_vector< double, 3 > &BundleControlPoint::corrections() {
@@ -536,9 +544,9 @@ namespace Isis {
 
 
   /**
-   * Accesses the 3 dimensional ordered vector of apriori sigmas (apriori 
-   * coordinate1, apriori coordinate2, apriori coordinate3). 
-   * 
+   * Accesses the 3 dimensional ordered vector of apriori sigmas (apriori
+   * coordinate1, apriori coordinate2, apriori coordinate3).
+   *
    * @return @b boost::numeric::ublas::bounded_vector<double,3>& The vector of apriori sigmas.
    */
   boost::numeric::ublas::bounded_vector< double, 3 > &BundleControlPoint::aprioriSigmas() {
@@ -550,9 +558,9 @@ namespace Isis {
 
 
   /**
-   * Accesses the 3 dimensional ordered vector of adjusted sigmas (adjusted 
-   * coordinate1, adjusted coordinate2, adjusted coordinate3). 
-   * 
+   * Accesses the 3 dimensional ordered vector of adjusted sigmas (adjusted
+   * coordinate1, adjusted coordinate2, adjusted coordinate3).
+   *
    * @return @b boost::numeric::ublas::bounded_vector<double,3>& The vector of adjusted sigmas.
    */
   boost::numeric::ublas::bounded_vector< double, 3 > &BundleControlPoint::adjustedSigmas() {
@@ -561,9 +569,9 @@ namespace Isis {
 
 
   /**
-   * Accesses the 3 dimensional ordered vector of weight values associated 
-   * with coordinate1, coordinate2, and coordinate3. 
-   * 
+   * Accesses the 3 dimensional ordered vector of weight values associated
+   * with coordinate1, coordinate2, and coordinate3.
+   *
    * @return @b boost::numeric::ublas::bounded_vector<double,3>& The vector of weight values.
    */
   boost::numeric::ublas::bounded_vector< double, 3 > &BundleControlPoint::weights() {
@@ -572,8 +580,8 @@ namespace Isis {
 
 
   /**
-   * Accesses the 3 dimensional ordered NIC vector. 
-   * 
+   * Accesses the 3 dimensional ordered NIC vector.
+   *
    * @return @b boost::numeric::ublas::bounded_vector<double,3>& The NIC vector.
    */
   boost::numeric::ublas::bounded_vector<double, 3> &BundleControlPoint::nicVector() {
@@ -583,7 +591,7 @@ namespace Isis {
 
   /**
    * Accesses the CholMod matrix associated with this BundleControlPoint.
-   * 
+   *
    * @return @b SparseBlockRowMatrix& The CholMod row matrix.
    */
   SparseBlockRowMatrix &BundleControlPoint::cholmodQMatrix() {
@@ -592,17 +600,17 @@ namespace Isis {
 
 
   /**
-   * Formats an output summary string for this BundleControlPoint. This string 
-   * includes ID, point type, number of rays from non-rejected measures, 
-   * residual RMS, adjusted coordinate1, adjusted coordinate 2, and adjusted 
-   * coordinate 3 followed by the adjusted sigmas.  In the case of Latitudinal 
-   * coordinates, the coordinates will be adjusted latitude and longitude (in degrees), 
-   * the adjusted radius (in km), and the adjusted sigmas for latitude, longitude and 
-   * radius all in meters.  In the case of Rectangular coordinates, the coordinates 
-   * will be X, Y, Z (in km), and the adjusted sigmas for X, Y, and Z all in meters. 
-   *  
+   * Formats an output summary string for this BundleControlPoint. This string
+   * includes ID, point type, number of rays from non-rejected measures,
+   * residual RMS, adjusted coordinate1, adjusted coordinate 2, and adjusted
+   * coordinate 3 followed by the adjusted sigmas.  In the case of Latitudinal
+   * coordinates, the coordinates will be adjusted latitude and longitude (in degrees),
+   * the adjusted radius (in km), and the adjusted sigmas for latitude, longitude and
+   * radius all in meters.  In the case of Rectangular coordinates, the coordinates
+   * will be X, Y, Z (in km), and the adjusted sigmas for X, Y, and Z all in meters.
+   *
    * @param errorPropagation Indicates whether error propagation was selected.
-   * 
+   *
    * @return @b QString The formatted output summary string.
    */
   QString BundleControlPoint::formatBundleOutputSummaryString(bool errorPropagation) const {
@@ -611,7 +619,7 @@ namespace Isis {
     int numGoodRays    = numRays - numberOfRejectedMeasures();
     double ResidualRms = residualRms();
 
-    // Return generic set of control point coordinates as floating point values 
+    // Return generic set of control point coordinates as floating point values
     // Be careful because of the potential to confuse units.
     SurfacePoint::CoordUnits units = SurfacePoint::Degrees;
     if (m_coordTypeReports == SurfacePoint::Rectangular) units = SurfacePoint::Kilometers;
@@ -642,20 +650,20 @@ namespace Isis {
 
 
   /**
-   * Formats a detailed output string table for this BundleControlPoint. 
-   *  
+   * Formats a detailed output string table for this BundleControlPoint.
+   *
    * @param errorPropagation Indicates whether error propagation was selected.
-   * @param RTM Conversion factor from radians to meters. Used to convert the 
+   * @param RTM Conversion factor from radians to meters. Used to convert the
    *            latitude and longitude corrections to meters.
    * @param solveRadius A flag indicating to solve for each points individual radius.
    *            When solveRadius is false, the point radius is heavily weighted
-   * 
+   *
    * @return @b QString The formatted output detailed string.
    */
   QString BundleControlPoint::formatBundleOutputDetailString(bool errorPropagation,
                                                              bool solveRadius) const {
     QString output;
-    
+
     switch (m_coordTypeReports) {
       case SurfacePoint::Latitudinal:
         output = formatBundleLatitudinalOutputDetailString(errorPropagation, solveRadius);
@@ -669,19 +677,19 @@ namespace Isis {
     }
     return output;
   }
-     
+
 
   /**
-   * Formats a detailed output string table for this Latitudinal BundleControlPoint. 
-   *  
+   * Formats a detailed output string table for this Latitudinal BundleControlPoint.
+   *
    * @param errorPropagation Indicates whether error propagation was selected.
-   * @param RTM Conversion factor from radians to meters. Used to convert the 
+   * @param RTM Conversion factor from radians to meters. Used to convert the
    *            latitude and longitude corrections to meters.
    * @param solveRadius A flag indicating to solve for each points individual radius.
    *            When solveRadius is false, the point radius is heavily weighted
-   * 
+   *
    * @return @b QString The formatted output detailed string.
-   * 
+   *
    * @internal
    *  @history 2017-08-24 Debbie A. Cook - Revised units of cor_rad to be km instead of meters
    *                                                     when outputting latitudinal corrections in degrees.  Fixed
@@ -725,7 +733,7 @@ namespace Isis {
       double yCor = m_corrections(1);  // km
       double z      = m_controlPoint->GetAdjustedSurfacePoint().GetZ().kilometers();
       double zCor = m_corrections(2);  // km
-      
+
       if (!IsSpecial(x) && !IsSpecial(y) && !IsSpecial(z)) {
         SurfacePoint rectPoint(Displacement(x - xCor, Displacement::Kilometers),
                               Displacement(y - yCor, Displacement::Kilometers),
@@ -753,7 +761,7 @@ namespace Isis {
       cor_rad_m  = m_corrections(2) * 1000.0;                   // radius correction, meters
 
       cor_lat_m = m_controlPoint->GetAdjustedSurfacePoint().LatitudeToMeters(m_corrections(0));
-      cor_lon_m = m_controlPoint->GetAdjustedSurfacePoint().LongitudeToMeters(m_corrections(1));  
+      cor_lon_m = m_controlPoint->GetAdjustedSurfacePoint().LongitudeToMeters(m_corrections(1));
       cor_rad_km = m_corrections(2);
 
       if (!IsSpecial(lat)) {
@@ -796,10 +804,10 @@ namespace Isis {
     output += QString("  LATITUDE%1%2%3%4%5%6\n")
         .arg(formatValue(latInit, 17, 8))                                         // deg
         .arg(formatValue(cor_lat_dd, 21, 8))                                 // deg
-        .arg(formatValue(cor_lat_m, 20, 8))                                  // m 
+        .arg(formatValue(cor_lat_m, 20, 8))                                  // m
         .arg(formatValue(lat, 20, 8))                                              // deg
         .arg(formatCoordAprioriSigmaString(idx, 18,8, true))        // m
-        .arg(formatCoordAdjustedSigmaString(idx, 18,8,errorPropagation)); // m 
+        .arg(formatCoordAdjustedSigmaString(idx, 18,8,errorPropagation)); // m
 
     idx = SurfacePoint::Two;
     output += QString(" LONGITUDE%1%2%3%4%5%6\n")
@@ -821,17 +829,17 @@ namespace Isis {
 
     return output;
   }
-     
+
 
   /**
-   * Formats a detailed output string table for this Rectangular BundleControlPoint. 
-   *  
+   * Formats a detailed output string table for this Rectangular BundleControlPoint.
+   *
    * @param errorPropagation Indicates whether error propagation was selected.
-   * 
+   *
    * @return @b QString The formatted output detailed string.
-   * 
+   *
    * @internal
-   *  @history 2017-08-24 Debbie A. Cook - Corrected units reported in comments to correctly report 
+   *  @history 2017-08-24 Debbie A. Cook - Corrected units reported in comments to correctly report
    *                                                       km and also in label line.
    */
  QString BundleControlPoint::formatBundleRectangularOutputDetailString
@@ -851,7 +859,7 @@ namespace Isis {
     double XInit = Isis::Null;
     double YInit = Isis::Null;
     double ZInit = Isis::Null;
-    
+
     if (m_coordTypeBundle == SurfacePoint::Latitudinal) {
       double lat      = m_controlPoint->GetAdjustedSurfacePoint().GetLatitude().degrees();
       double latcor = m_corrections(0) * RAD2DEG;
@@ -923,10 +931,10 @@ namespace Isis {
     SurfacePoint::CoordIndex idx = SurfacePoint::One;
     output += QString(" BODY-FIXED-X%1%2%3%4%5\n")
             .arg(formatValue(XInit, 17, 8))                                       // km
-            .arg(formatValue(cor_X_m, 20, 8))                                // km 
+            .arg(formatValue(cor_X_m, 20, 8))                                // km
             .arg(formatValue(X, 20, 8))                                           // km
             .arg(formatCoordAprioriSigmaString(idx, 18,8, true))   // m
-            .arg(formatCoordAdjustedSigmaString(idx, 18,8,errorPropagation)); // m 
+            .arg(formatCoordAdjustedSigmaString(idx, 18,8,errorPropagation)); // m
 
     idx = SurfacePoint::Two;
     output += QString(" BODY-FIXED-Y%1%2%3%4%5\n")
@@ -951,35 +959,35 @@ namespace Isis {
 
 
   /**
-   * Formats the given double precision value using the specified field width 
-   * and precision. If the given value is special, then "Null" is returned. 
-   *  
+   * Formats the given double precision value using the specified field width
+   * and precision. If the given value is special, then "Null" is returned.
+   *
    * @param value The double value to be formattted.
    * @param fieldWidth The return string's field width.
    * @param precision The precision of the given double value to be saved off.
-   * 
+   *
    * @return @b QString The formatted value, as a string.
    */
   QString BundleControlPoint::formatValue(double value, int fieldWidth, int precision) const {
     QString output;
-    IsSpecial(value) ? 
+    IsSpecial(value) ?
       output = QString("%1").arg("Null", fieldWidth) :
       output = QString("%1").arg(value, fieldWidth, 'f', precision);
     return output;
   }
 
-  
+
   /**
-   * Formats the apriori sigma value indicated by the given type code. If no 
-   * sigma was set, then the string "N/A" will be returned. 
-   *  
-   * @param index CoordIndex Coordinate index One: Latitude or X, Two:  Longitude or Y,  
+   * Formats the apriori sigma value indicated by the given type code. If no
+   * sigma was set, then the string "N/A" will be returned.
+   *
+   * @param index CoordIndex Coordinate index One: Latitude or X, Two:  Longitude or Y,
    *                                 or Three: Radius or Z
    * @param fieldWidth The return string's field width.
    * @param precision The precision of the double to be saved off.
    * @param solveRadius A flag indicating to solve for each points individual radius.
    *            When solveRadius is false, the point radius is heavily weighted
-   * 
+   *
    * @return @b QString The formatted value, as a string.
    */
   QString BundleControlPoint::formatAprioriSigmaString(SurfacePoint::CoordIndex index,
@@ -1002,17 +1010,17 @@ namespace Isis {
 
 
   /**
-   * Formats the apriori coordinate 1 (latitude or X) sigma value. 
-   *  
+   * Formats the apriori coordinate 1 (latitude or X) sigma value.
+   *
    * @param fieldWidth The return string's field width.
    * @param precision The precision of the double to be saved off.
-   * 
+   *
    * @return @b QString The formatted apriori coordinate 1 sigma value, as a string.
-   *  
-   * @see formatAprioriSigmaString() 
+   *
+   * @see formatAprioriSigmaString()
    */
 QString BundleControlPoint::formatCoordAprioriSigmaString(SurfacePoint::CoordIndex index,
-                                                          int fieldWidth, 
+                                                          int fieldWidth,
                                                           int precision,
                                                           bool solveRadius) const {
     return formatAprioriSigmaString(index, fieldWidth, precision, solveRadius);
@@ -1020,16 +1028,16 @@ QString BundleControlPoint::formatCoordAprioriSigmaString(SurfacePoint::CoordInd
 
 
   /**
-   * Formats the adjusted sigma value indicated by the given type code. If error 
-   * propagation is false or the selected sigma type was set to Null, then only 
-   * "N/A" will be returned. 
-   *  
-   * @param index CoordIndex  Coordinate index One: Latitude or X, Two:  Longitude or Y,  
+   * Formats the adjusted sigma value indicated by the given type code. If error
+   * propagation is false or the selected sigma type was set to Null, then only
+   * "N/A" will be returned.
+   *
+   * @param index CoordIndex  Coordinate index One: Latitude or X, Two:  Longitude or Y,
    *                                 or Three: Radius or Z
    * @param fieldWidth The return string's field width.
    * @param precision The precision of the double to be saved off.
    * @param errorPropagation Indicates whether error propagation was selected.
-   * 
+   *
    * @return @b QString The formatted value, as a string.
    */
   QString BundleControlPoint::formatAdjustedSigmaString(SurfacePoint::CoordIndex index,
@@ -1057,16 +1065,16 @@ QString BundleControlPoint::formatCoordAprioriSigmaString(SurfacePoint::CoordInd
 
 
   /**
-   * Formats the adjusted coordinate sigma value. 
-   *  
+   * Formats the adjusted coordinate sigma value.
+   *
    * @param index The coordinate index of the sigma to return.
    * @param fieldWidth The return string's field width.
    * @param precision The precision of the double to be saved off.
    * @param errorPropagation Indicates whether error propagation was selected.
-   * 
+   *
    * @return @b QString The formatted adjusted coordinate sigma value, as a string.
-   *  
-   * @see formatAdjustedSigmaString() 
+   *
+   * @see formatAdjustedSigmaString()
    */
 QString BundleControlPoint::formatCoordAdjustedSigmaString(SurfacePoint::CoordIndex index,
                                                                 int fieldWidth, int precision,
@@ -1115,7 +1123,7 @@ QString BundleControlPoint::formatCoordAdjustedSigmaString(SurfacePoint::CoordIn
 
       // convert to meters and apply
       pointRad += 1000. * radCorrection;
-      
+
       // ken testing - if solving for target body mean radius, set radius to current
       // mean radius value
       // Only allow radius options for Latitudinal coordinates
@@ -1163,7 +1171,7 @@ QString BundleControlPoint::formatCoordAdjustedSigmaString(SurfacePoint::CoordIn
       pointX += 1000. * XCorrection;
       pointY += 1000. * YCorrection;
       pointZ += 1000. * ZCorrection;
-    
+
       surfacepoint.SetRectangularCoordinates(
                                              Displacement(pointX, Displacement::Meters),
                                              Displacement(pointY, Displacement::Meters),
diff --git a/isis/src/control/objs/BundleUtilities/BundleControlPoint.h b/isis/src/control/objs/BundleUtilities/BundleControlPoint.h
index 852164af04e4315cb76ebe4f23b28d824b8f3062..2693694de8a1f49911b52c4cc8631822bf404e48 100644
--- a/isis/src/control/objs/BundleUtilities/BundleControlPoint.h
+++ b/isis/src/control/objs/BundleUtilities/BundleControlPoint.h
@@ -1,27 +1,13 @@
 #ifndef BundleControlPoint_h
 #define BundleControlPoint_h
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2014/5/22 01:35:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QVector>
 
@@ -41,7 +27,7 @@ namespace Isis {
 
   /**
    * This class holds information about a control point that BundleAdjust needs to run correctly.
-   * 
+   *
    * This class was created to extract functionality from BundleAdjust and wrap a ControlPoint
    * with the extra necessary information to correctly perform a bundle adjustment.
    *
@@ -57,7 +43,7 @@ namespace Isis {
    *   @history 2016-06-27 Jesse Mapel - Updated documentation and ISIS coding standards in
    *                           preparation for merging IPCE into ISIS.  Fixes #4075.
    *   @history 2016-08-15 Ian Humphrey - Added computeResiduals(), setNumberOfRejectedMeasures(),
-   *                           setRejected(), zeroNumberOfRejectedMeasures(), 
+   *                           setRejected(), zeroNumberOfRejectedMeasures(),
    *                           numberOfRejectedMeasures(), residualRms(), and type(). Modified
    *                           numberMeasures() to return this->size(), since only non-ignored
    *                           control measures will be added to this BundleControlPoint.
@@ -69,22 +55,22 @@ namespace Isis {
    *   @history 2016-10-27 Tyler Wilson - Modified formatRadiusAprioriSigmaString, formatAprioriSigmaString,
    *                          and formatBundleOutputDetailString to accept a third argument (bool solveRadius)
    *                          with a default value = false.  References #4317.
-   *   @history 2017-07-26 Debbie A. Cook - Added BundleSettings and metersToRadians as arguments 
-   *                           to constructor and moved setWeights call from BundleAdjust::init into 
-   *                           constructor.   Added m_bundleControlPointCoordinateType.  This option 
-   *                           determines how control point coordinates are entered into 
-   *                           BundleControlPoint, interpreted throughout the adjustment, and 
+   *   @history 2017-07-26 Debbie A. Cook - Added BundleSettings and metersToRadians as arguments
+   *                           to constructor and moved setWeights call from BundleAdjust::init into
+   *                           constructor.   Added m_bundleControlPointCoordinateType.  This option
+   *                           determines how control point coordinates are entered into
+   *                           BundleControlPoint, interpreted throughout the adjustment, and
    *                           output. The coordinate type needs to be in this class, because
-   *                           BundleControlPoints are created without a parent control net and added to 
+   *                           BundleControlPoints are created without a parent control net and added to
    *                           a control net later.  Made format methods generic in regards to coordinate type.
    *                           Added utility method setSigmaWeightFromGlobals.
-   *                           Merged methods formatLatitudeAdjustedSigmaString, 
+   *                           Merged methods formatLatitudeAdjustedSigmaString,
    *                           formatLongitudeAdjustedSigmaString, and formatRadiusAdjustedSigmaString
-   *                           into a single generic coordinate method with an additional argument 
-   *                           for the coordinate index.  Did a similar merge for the family of  
+   *                           into a single generic coordinate method with an additional argument
+   *                           for the coordinate index.  Did a similar merge for the family of
    *                           methods like formatLatitudeAprioriSigmaString.  Moved some of the
-   *                           functionality from BundleAdjust to this class as a new method 
-   *                           applyParameterCorrections.  Also had to move BundleAdjust method 
+   *                           functionality from BundleAdjust to this class as a new method
+   *                           applyParameterCorrections.  Also had to move BundleAdjust method
    *                           productAlphaAV to this class to support applyParameterCorrections.
    *                           References #4649 and #501.
    *  @history 2017-08-24 Debbie A. Cook - Revised output units to be compatible with output from
@@ -95,11 +81,11 @@ namespace Isis {
    *  @history 2018-05-31 Debbie A. Cook - Moved code from BundleAdjust::applyParameterCorrections
    *                           pertaining to updating the adjusted surface point and method productAlphaAv into new
    *                           methods applyParameterCorrections, updateAdjustedSurfacePointLatitudinally, and
-   *                           updateAdjustedSurfacePointRectangularly in BundleControlPoint.  Reference 
+   *                           updateAdjustedSurfacePointRectangularly in BundleControlPoint.  Reference
    *                           #4649 and #501.
    *  @history 2018-09-28 Debbie A. Cook - Removed the metersToRadians argument from
    *                           the constructor and from the setWeights method since we are now
-   *                           using the local radius of the point to convert lat/lon sigmas 
+   *                           using the local radius of the point to convert lat/lon sigmas
    *                           from meters to radians.  References #4649 and #501.
   */
   class BundleControlPoint : public QVector<BundleMeasureQsp> {
@@ -127,8 +113,8 @@ namespace Isis {
       void setNumberOfRejectedMeasures(int numRejected);
       void setRejected(bool reject);
       void setWeights(const BundleSettingsQsp settings);
-      void setSigmaWeightFromGlobals(double gSigma, int index); 
-      void setSigmaWeightFromGlobals(double gSigma, int index, double cFactor); 
+      void setSigmaWeightFromGlobals(double gSigma, int index);
+      void setSigmaWeightFromGlobals(double gSigma, int index, double cFactor);
       void zeroNumberOfRejectedMeasures();
       void productAlphaAV(double alpha,
                           SparseBlockMatrix &sparseNormals,
@@ -159,7 +145,7 @@ namespace Isis {
       // string format methods
       QString formatBundleOutputSummaryString(bool errorPropagation) const;
       QString formatBundleOutputDetailString(bool errorPropagation, bool solveRadius=false) const;
-      QString formatBundleLatitudinalOutputDetailString(bool errorPropagation, 
+      QString formatBundleLatitudinalOutputDetailString(bool errorPropagation,
                                                         bool solveRadius=false) const;
       QString formatBundleRectangularOutputDetailString(bool errorPropagation) const;
       QString formatValue(double value, int fieldWidth, int precision) const;
@@ -176,7 +162,7 @@ namespace Isis {
       // methods
       void updateAdjustedSurfacePointLatitudinally(const BundleTargetBodyQsp target);
       void updateAdjustedSurfacePointRectangularly();
-      
+
       //!< pointer to the control point object this represents
       ControlPoint *m_controlPoint;
 
@@ -203,4 +189,3 @@ namespace Isis {
 }
 
 #endif // BundleControlPoint_h
-
diff --git a/isis/src/control/objs/BundleUtilities/BundleImage.cpp b/isis/src/control/objs/BundleUtilities/BundleImage.cpp
index 62308ca8cc1a603058286ede337ebf526859eede..1fef1b9a66d5c6691fd54bd096302566ea1b3543 100644
--- a/isis/src/control/objs/BundleUtilities/BundleImage.cpp
+++ b/isis/src/control/objs/BundleUtilities/BundleImage.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleImage.h"
 
 #include "BundleObservation.h"
@@ -9,7 +17,7 @@ namespace Isis {
   /**
    * Constructs a BundleImage with the given camera pointer, serial number, and filename.
    * Parent observation defaults to NULL.
-   * 
+   *
    * @param camera The camera model for the BundleImage
    * @param serialNumber The serial number for the BundleImage
    * @param fileName The file name for the BundleImage
@@ -17,13 +25,13 @@ namespace Isis {
   BundleImage::BundleImage(Camera *camera, QString serialNumber, QString fileName) {
     m_camera = camera;
     m_serialNumber = serialNumber;
-    m_fileName = fileName;    
+    m_fileName = fileName;
   }
 
 
   /**
    * Constructs a BundleImage from another BundleImage object.
-   * 
+   *
    * @param other The BundleImage to copy from.
    */
   BundleImage::BundleImage(const BundleImage &other) {
@@ -43,9 +51,9 @@ namespace Isis {
 
   /**
    * An assignment operator to set this BundleImage to another BundleImage object.
-   * 
+   *
    * @param other The BundleImage to copy from.
-   * 
+   *
    * @return @b BundleImage& A reference to this BundleImage after being assigned to.
    */
   BundleImage &BundleImage::operator=(const BundleImage &other) {
@@ -61,7 +69,7 @@ namespace Isis {
 
   /**
    * Sets the parent BundleObservation object.
-   * 
+   *
    * @param parentObservation The parent BundleObservation.
    */
   void BundleImage::setParentObservation(QSharedPointer<BundleObservation> parentObservation) {
@@ -75,7 +83,7 @@ namespace Isis {
 
   /**
    * Returns the camera model used for the BundleImage.
-   * 
+   *
    * @return @b Camera* A pointer to the camera model.
    */
   Camera *BundleImage::camera() {
@@ -85,7 +93,7 @@ namespace Isis {
 
   /**
    * Returns the parent BundleObservation object.
-   * 
+   *
    * @return @b QSharedPointer<BundleObservation> A pointer to the parent BundleObservation.
    */
   QSharedPointer<BundleObservation> BundleImage::parentObservation() {
@@ -95,7 +103,7 @@ namespace Isis {
 
   /**
    * Returns the serial number for the BundleImage.
-   * 
+   *
    * @return @b QString The image's serial number.
    */
   QString BundleImage::serialNumber() {
@@ -105,7 +113,7 @@ namespace Isis {
 
   /**
    * Returns the file name for the BundleImage.
-   * 
+   *
    * @return @b QString The image's file name.
    */
   QString BundleImage::fileName() {
diff --git a/isis/src/control/objs/BundleUtilities/BundleImage.h b/isis/src/control/objs/BundleUtilities/BundleImage.h
index 5fa312dc91c11dcfb37bf4dd141f9381505ef31c..83afd67523cbfa063af163dea69bfbf58fdc455a 100644
--- a/isis/src/control/objs/BundleUtilities/BundleImage.h
+++ b/isis/src/control/objs/BundleUtilities/BundleImage.h
@@ -1,28 +1,13 @@
 #ifndef BundleImage_h
 #define BundleImage_h
 
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2014/5/22 01:35:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QSharedPointer>
 
@@ -33,7 +18,7 @@ namespace Isis {
 
   /**
    * This class hold image information that BundleAdjust needs to run correctly.
-   * 
+   *
    * @author 2014-05-22 Ken Edmundson
    *
    * @internal
@@ -46,7 +31,7 @@ namespace Isis {
    *   @history 2016-08-03 Jesse Mapel - Changed parent observation to a QSharedPointer.
    *                           Fixes #4150.
    *   @history 2016-08-18 Jesse Mapel - Changed to no longer inherit from QObject.  Fixes #4192.
-   *   
+   *
    */
   class BundleImage {
 
diff --git a/isis/src/control/objs/BundleUtilities/BundleMeasure.cpp b/isis/src/control/objs/BundleUtilities/BundleMeasure.cpp
index 1de008d3a22d78651c3450ad514db9f299f076dc..37ac85685e47167a0bb74ac8fbde6d8ee736cace 100644
--- a/isis/src/control/objs/BundleUtilities/BundleMeasure.cpp
+++ b/isis/src/control/objs/BundleUtilities/BundleMeasure.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleMeasure.h"
 #include "BundleObservation.h"
 #include "BundleObservationSolveSettings.h"
@@ -11,7 +19,7 @@ namespace Isis {
    * Constructor
    *
    * Constructs a BundleMeasure from a ControlMeasure with the passed BundleControlPoint as its
-   * parent control point 
+   * parent control point
    *
    * @param controlMeasure Pointer to the ControlMeasure to store
    * @param bundleControlPoint Pointer to the BundleControlPoint that contains this
@@ -51,7 +59,7 @@ namespace Isis {
    *
    * Assigns the state of this BundleMeasure from another BundleMeasure
    *
-   * @param src The source BundleMeasure to assign state from 
+   * @param src The source BundleMeasure to assign state from
    *
    * @return @b BundleMeasure& Returns a reference to this BundleMeasure
    */
@@ -71,7 +79,7 @@ namespace Isis {
   /**
    * Sets the parent bundle observation
    *
-   * @param observation Pointer to the parent BundleObservation  
+   * @param observation Pointer to the parent BundleObservation
    */
   void BundleMeasure::setParentObservation(QSharedPointer<BundleObservation> observation) {
     m_parentObservation = observation;
@@ -81,7 +89,7 @@ namespace Isis {
   /**
    * Sets the parent bundle image
    *
-   * @param image Pointer to the parent BundleImage  
+   * @param image Pointer to the parent BundleImage
    */
   void BundleMeasure::setParentImage(QSharedPointer<BundleImage> image) {
     m_parentBundleImage = image;
@@ -96,7 +104,7 @@ namespace Isis {
    * @see ControlMeasure::SetRejected(bool reject)
    */
   void BundleMeasure::setRejected(bool reject) {
-    m_controlMeasure->SetRejected(reject); 
+    m_controlMeasure->SetRejected(reject);
   }
 
 
@@ -159,7 +167,7 @@ namespace Isis {
    *
    * @return @b const QSharedPointer<BundleObservationSolveSettings> Returns a const pointer to
    *     the BundleObservationSolveSettings for the parent BundleObservation
-   * 
+   *
    * @throws IException::Programmer "In BundleMeasure::observationSolveSettings:
    *                                 parent observation has not been set."
    */
@@ -178,7 +186,7 @@ namespace Isis {
    *
    * @see ControlMeasure::GetSample()
    *
-   * @return @b double Returns the sample measurement for this control measure 
+   * @return @b double Returns the sample measurement for this control measure
    */
   double BundleMeasure::sample() const {
     return m_controlMeasure->GetSample();
@@ -202,7 +210,7 @@ namespace Isis {
    *
    * @see ControlMeasure::GetLine()
    *
-   * @return @b double Returns the line measurement for this control measure 
+   * @return @b double Returns the line measurement for this control measure
    */
   double BundleMeasure::line() const {
     return m_controlMeasure->GetLine();
@@ -234,10 +242,10 @@ namespace Isis {
 
 
   /**
-   * Accesses the serial number of the cube containing this control measure 
+   * Accesses the serial number of the cube containing this control measure
    *
    * @see ControlMeasure::GetCubeSerialNumber()
-   * 
+   *
    * @return @b QString Returns the serial number of the cube that contains this control measure
    */
   QString BundleMeasure::cubeSerialNumber() const {
@@ -299,7 +307,7 @@ namespace Isis {
    * @see BundleObservation::index()
    *
    * @return @b int Returns the observation index of the parent observation
-   * 
+   *
    * @throws IException::Programmer "In BundleMeasure::observationIndex:
    *                                 parent observation has not been set."
    */
diff --git a/isis/src/control/objs/BundleUtilities/BundleMeasure.h b/isis/src/control/objs/BundleUtilities/BundleMeasure.h
index 82a2d0f9773c6cb2f0895626f1389b5d7b289518..9fe05fbe84a31c235123f40596592343cf70e7d6 100644
--- a/isis/src/control/objs/BundleUtilities/BundleMeasure.h
+++ b/isis/src/control/objs/BundleUtilities/BundleMeasure.h
@@ -1,27 +1,13 @@
 #ifndef BundleMeasure_h
 #define BundleMeasure_h
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2014/5/22 01:35:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QSharedPointer>
 
@@ -37,10 +23,10 @@ namespace Isis {
    * @brief A container class for a ControlMeasure.
    *
    * This class is used as a wrapper around a ControlMeasure to provide the necessary information
-   * for BundleAdjust. This class can be used to get the parent bundle observation solve settings 
+   * for BundleAdjust. This class can be used to get the parent bundle observation solve settings
    * for observation mode adjustment.
    *
-   * Note that a BundleMeasure should be created from a non-ignored ControlMeasure. 
+   * Note that a BundleMeasure should be created from a non-ignored ControlMeasure.
    *
    * @ingroup ControlNetworks
    *
diff --git a/isis/src/control/objs/BundleUtilities/BundleObservation.cpp b/isis/src/control/objs/BundleUtilities/BundleObservation.cpp
index cc0eae051c9fe2543c24cdfb255aa4d62fbfddba..4b1817bf7d9a55b6952d80ac90195e4ce458baa7 100644
--- a/isis/src/control/objs/BundleUtilities/BundleObservation.cpp
+++ b/isis/src/control/objs/BundleUtilities/BundleObservation.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleObservation.h"
 
 #include <QDebug>
diff --git a/isis/src/control/objs/BundleUtilities/BundleObservation.h b/isis/src/control/objs/BundleUtilities/BundleObservation.h
index 5b47719127c9608e263e6debf5bf10f042259b50..1e0faae6d475ef6c5fcf8e080b1a47bb9c882002 100644
--- a/isis/src/control/objs/BundleUtilities/BundleObservation.h
+++ b/isis/src/control/objs/BundleUtilities/BundleObservation.h
@@ -1,27 +1,13 @@
 #ifndef BundleObservation_h
 #define BundleObservation_h
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2014/5/22 01:35:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QStringList>
 #include <QVector>
diff --git a/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.cpp b/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.cpp
index 5fed7b0456cc876903336c9dfb3f9996d9093251..0d728bc9f7ae86c02e0eea9259d8b637d997c3fb 100644
--- a/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.cpp
+++ b/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleObservationSolveSettings.h"
 
 #include <QDataStream>
diff --git a/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.h b/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.h
index a758d96ec7e869be075f0dbb90f601e14390333c..54cd5573bc53ac29b82bfec784d0a5d1ba7e0881 100644
--- a/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.h
+++ b/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.h
@@ -1,27 +1,13 @@
 #ifndef BundleObservationSolveSettings_h
 #define BundleObservationSolveSettings_h
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2014/5/28 09:31:00 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QList>
 #include <QSet>
diff --git a/isis/src/control/objs/BundleUtilities/BundleObservationVector.cpp b/isis/src/control/objs/BundleUtilities/BundleObservationVector.cpp
index db1bf7c3d8df6f5c9f78ab5cb61c6891b6cb7545..697d8e2009290f3d1226a7f674f21ad42d96b679 100644
--- a/isis/src/control/objs/BundleUtilities/BundleObservationVector.cpp
+++ b/isis/src/control/objs/BundleUtilities/BundleObservationVector.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleObservationVector.h"
 
 #include <QDebug>
@@ -16,9 +24,9 @@ namespace Isis {
 
   /**
    * Copy constructor.
-   * 
+   *
    * Constructs a BundleObservationVector as a copy of another BundleObservationVector.
-   * 
+   *
    * @param src A reference to the BundleObservationVector to copy from.
    */
   BundleObservationVector::BundleObservationVector(const BundleObservationVector &src)
@@ -40,11 +48,11 @@ namespace Isis {
 
   /**
    * Assignment operator.
-   * 
+   *
    * Assigns the state of the source BundleObservationVector to this BundleObservationVector.
-   * 
+   *
    * @param src The BundleObservationVector to assign from.
-   * 
+   *
    * @return @b BundleObservationVector& A reference to this BundleObservationVector.
    */
   BundleObservationVector &BundleObservationVector::operator=(const BundleObservationVector &src) {
@@ -70,14 +78,14 @@ namespace Isis {
    * @param observationNumber Observation number of the observation to add or fetch
    * @param instrumentId Instrument id of the observation
    * @param bundleSettings Qsp to BundleSettings for the observation
-   * 
+   *
    * @throws IException::Programmer "Unable to allocate new BundleObservation"
    *
    * @return @b BundleObservationQsp Returns a pointer to the BundleObservation that was added
-   * 
+   *
    * @internal
-   *   @history 2016-10-13 Ian Humphrey - When appending a new BundleObservation and there are 
-   *                           multiple BundleObservationSolveSettings, we set the settings 
+   *   @history 2016-10-13 Ian Humphrey - When appending a new BundleObservation and there are
+   *                           multiple BundleObservationSolveSettings, we set the settings
    *                           according to the observation number passed. References #4293.
    */
   BundleObservationQsp BundleObservationVector::addNew(BundleImageQsp bundleImage,
@@ -90,7 +98,7 @@ namespace Isis {
     if (bundleSettings->solveObservationMode() &&
         m_observationNumberToObservationMap.contains(observationNumber)) {
       bundleObservation = m_observationNumberToObservationMap.value(observationNumber);
-    
+
       addToExisting = true;
     }
 
@@ -121,7 +129,7 @@ namespace Isis {
       }
 
       bundleImage->setParentObservation(bundleObservation);
-  
+
       // Find the bundle observation solve settings for this new observation
       BundleObservationSolveSettings solveSettings;
       // When there is only one bundle observation solve setting, use it for all observations
@@ -131,7 +139,7 @@ namespace Isis {
       // Otherwise, we want to grab the bundle observation solve settings that is associated with
       // the observation number for this new observation
       else {
-        solveSettings = bundleSettings->observationSolveSettings(observationNumber);        
+        solveSettings = bundleSettings->observationSolveSettings(observationNumber);
       }
 
       bundleObservation->setSolveSettings(solveSettings);
@@ -154,7 +162,7 @@ namespace Isis {
   /**
    * Accesses the number of position parameters for the contained BundleObservations.
    *
-   * @return @b int Returns the total number of position parameters for the BundleObservations 
+   * @return @b int Returns the total number of position parameters for the BundleObservations
    */
   int BundleObservationVector::numberPositionParameters() {
     int positionParameters = 0;
@@ -171,7 +179,7 @@ namespace Isis {
   /**
    * Accesses the number of pointing parameters for the contained BundleObservations.
    *
-   * @return @b int Returns the total number of pointing parameters for the BundleObservations 
+   * @return @b int Returns the total number of pointing parameters for the BundleObservations
    */
   int BundleObservationVector::numberPointingParameters() {
     int pointingParameters = 0;
@@ -189,7 +197,7 @@ namespace Isis {
    * Returns the sum of the position parameters and pointing parameters for the contained
    * BundleObservations.
    *
-   * @return @b int Returns the total number of parameters for the contained BundleObservations 
+   * @return @b int Returns the total number of parameters for the contained BundleObservations
    */
   int BundleObservationVector::numberParameters() {
     return numberPositionParameters() + numberPointingParameters();
@@ -220,7 +228,7 @@ namespace Isis {
   /**
    * Initializes the exterior orientations for the contained BundleObservations.
    *
-   * @return @b bool Returns true upon successful initialization 
+   * @return @b bool Returns true upon successful initialization
    */
   bool BundleObservationVector::initializeExteriorOrientation() {
     int nObservations = size();
@@ -236,7 +244,7 @@ namespace Isis {
   /**
    * Initializes the body rotations for the contained BundleObservations.
    *
-   * @return @b bool Returns true upon successful initialization 
+   * @return @b bool Returns true upon successful initialization
    */
   bool BundleObservationVector::initializeBodyRotation() {
     int nObservations = size();
@@ -248,5 +256,3 @@ namespace Isis {
     return true;
   }
 }
-
-
diff --git a/isis/src/control/objs/BundleUtilities/BundleObservationVector.h b/isis/src/control/objs/BundleUtilities/BundleObservationVector.h
index 4441e57a66704f684a2d25d37e45edc457477ac1..b3b6b10a2683af670b5ee69610ae7c30459961c5 100644
--- a/isis/src/control/objs/BundleUtilities/BundleObservationVector.h
+++ b/isis/src/control/objs/BundleUtilities/BundleObservationVector.h
@@ -1,27 +1,13 @@
 #ifndef BundleObservationVector_h
 #define BundleObservationVector_h
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2014/5/22 01:35:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QMap>
 #include <QSharedPointer>
diff --git a/isis/src/control/objs/BundleUtilities/BundleTargetBody.cpp b/isis/src/control/objs/BundleUtilities/BundleTargetBody.cpp
index e0affaff46ee0dfd279cbc878768d236ad6d38d9..a575b18fcc1f7b70477f148f711a31ad8f2945c5 100644
--- a/isis/src/control/objs/BundleUtilities/BundleTargetBody.cpp
+++ b/isis/src/control/objs/BundleUtilities/BundleTargetBody.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleTargetBody.h"
 
 #include <QDebug>
@@ -35,7 +43,7 @@ namespace Isis {
 
   /**
    * Creates an BundleTargetBody object from a target.
-   * 
+   *
    * @param target A pointer to the target body that this object will represent.
    */
   BundleTargetBody::BundleTargetBody(Target *target) {
@@ -62,13 +70,13 @@ namespace Isis {
 
     m_raPole = target->poleRaCoefs();
     m_decPole = target->poleDecCoefs();
-    m_pm = target->pmCoefs();    
+    m_pm = target->pmCoefs();
   }
 
 
   /**
    * Copy constructor. Makes a copy of another BundleTargetBody.
-   * 
+   *
    * @param src The BundleTargetBody to copy from.
    */
   BundleTargetBody::BundleTargetBody(const BundleTargetBody &src) {
@@ -91,9 +99,9 @@ namespace Isis {
     m_pm = src.m_pm;
 
     m_parameterSolveCodes = src.m_parameterSolveCodes;
-    
+
     m_parameterNamesList = src.m_parameterNamesList;
-    
+
     m_weights = src.m_weights;
     m_corrections = src.m_corrections;
     m_solution = src.m_solution;
@@ -135,27 +143,27 @@ namespace Isis {
       m_pm = src.m_pm;
 
       m_parameterSolveCodes = src.m_parameterSolveCodes;
-      
+
       m_parameterNamesList = src.m_parameterNamesList;
-      
+
       m_weights = src.m_weights;
       m_corrections = src.m_corrections;
       m_solution = src.m_solution;
       m_aprioriSigmas = src.m_aprioriSigmas;
       m_adjustedSigmas = src.m_adjustedSigmas;
     }
-    
+
     return *this;
   }
 
 
   /**
    * @brief Sets the solve settings for the target body.
-   * 
+   *
    * Sets the solve settings for the target body's right ascension, declination,
    * prime meridian, and radius based on the input values.
    * Parameter vectors, sigma vectors and the weight vector will be filled in the following order:
-   * 
+   *
    * pole right ascension,
    * pole right ascension velocity,
    * pole right ascension acceleration,
@@ -169,16 +177,16 @@ namespace Isis {
    * triaxial radius B,
    * triaxial radius C,
    * mean radius.
-   * 
+   *
    * Any parameters that are not being solved for (based on targetParameterSolveCodes)
    * will be omitted.  For example, if solving for pole right ascension, pole declination,
    * prime meridian, and mean radius; the vectors would be:
-   * 
+   *
    * pole right ascension,
    * pole declination,
    * prime meridian,
    * mean radius.
-   * 
+   *
    * @param targetParameterSolveCodes A set of TargetSolveCodes indicating what to solve for.
    * @param aprioriPoleRA The apriori pole right ascension angle.
    * @param sigmaPoleRA The apriori pole right ascension angle sigma.
@@ -201,7 +209,7 @@ namespace Isis {
    * @param sigmaRadiusC The apriori C radius distance sigma.
    * @param aprioriMeanRadius The apriori mean radius distance.
    * @param sigmaMeanRadius the apriori mean radius distance sigma.
-   * 
+   *
    * @see readFromPvl(PvlObject &tbObject)
    */
   void BundleTargetBody::setSolveSettings(std::set<int> targetParameterSolveCodes,
@@ -421,7 +429,7 @@ namespace Isis {
 
   /**
    * If the pole right ascension angle will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solvePoleRA() {
@@ -433,7 +441,7 @@ namespace Isis {
 
   /**
    * If the pole right ascension velocity will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solvePoleRAVelocity() {
@@ -445,7 +453,7 @@ namespace Isis {
 
   /**
    * If the pole right ascension acceleration will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solvePoleRAAcceleration() {
@@ -457,7 +465,7 @@ namespace Isis {
 
   /**
    * If the pole declination angle will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solvePoleDec() {
@@ -469,7 +477,7 @@ namespace Isis {
 
   /**
    * If the pole declination velocity will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solvePoleDecVelocity() {
@@ -481,7 +489,7 @@ namespace Isis {
 
   /**
    * If the pole declination acceleration will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solvePoleDecAcceleration() {
@@ -493,7 +501,7 @@ namespace Isis {
 
   /**
    * If the prime meridian angle will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solvePM() {
@@ -505,7 +513,7 @@ namespace Isis {
 
   /**
    * If the prime meridian velocity will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solvePMVelocity() {
@@ -517,7 +525,7 @@ namespace Isis {
 
   /**
    * If the prime meridian acceleration will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solvePMAcceleration() {
@@ -529,7 +537,7 @@ namespace Isis {
 
   /**
    * If the triaxial radii will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solveTriaxialRadii() {
@@ -543,7 +551,7 @@ namespace Isis {
 
   /**
    * If the mean radius will be solved for with this target body.
-   * 
+   *
    * @return @b bool If it will be solved for.
    */
   bool BundleTargetBody::solveMeanRadius() {
@@ -555,18 +563,18 @@ namespace Isis {
 
   /**
    * @brief Applies a vector of corrections to the parameters for the target body.
-   * 
+   *
    * Applies a vector of corrections to the internal parameters for the
    * target body and records the corrections in the internal corrections vector.
    * The corrections vector should be ordered the same as the parameter vector descriped
    * in setSolveSettings.
-   * 
+   *
    * @param corrections The vector containing correction values.
-   * 
+   *
    * @throws IException::Programmer "In BundleTargetBody::applyParameterCorrections:
    *                                 correction and m_targetParameter vectors sizes don't match."
    * @throws IException::Unknown "Unable to apply parameter corrections to BundleTargetBody."
-   * 
+   *
    * @see setSolveSettings
    */
   void BundleTargetBody::applyParameterCorrections(
@@ -583,7 +591,7 @@ namespace Isis {
 
     try {
       int n = 0;
-      for (std::set<int>::iterator it=m_parameterSolveCodes.begin(); 
+      for (std::set<int>::iterator it=m_parameterSolveCodes.begin();
            it!=m_parameterSolveCodes.end(); ++it) {
         switch (*it) {
           case PoleRA:
@@ -663,11 +671,11 @@ namespace Isis {
 
   /**
    * Converts a QString to a TargetRadiiSolveMethod.
-   * 
+   *
    * @param method The Qstring of a solve method.
-   * 
+   *
    * @return @b TargetRadiiSolveMethod The converted solve method.
-   * 
+   *
    * @throws IException::Programmer "Unknown target body radius solution method"
    */
   BundleTargetBody::TargetRadiiSolveMethod BundleTargetBody::stringToTargetRadiiOption(
@@ -691,11 +699,11 @@ namespace Isis {
 
   /**
    * Converts a TargetRadiiSolveMethod to a QString
-   * 
+   *
    * @param method The TargetRadiiSolveMethod to convert.
-   * 
+   *
    * @return @b QString The solve method as a QString.
-   * 
+   *
    * @throws IException::Programmer "Unknown target body radius solve method enum"
    */
   QString BundleTargetBody::targetRadiiOptionToString(TargetRadiiSolveMethod method) {
@@ -714,9 +722,9 @@ namespace Isis {
   /**
    * Returns the vector of parameter weights.
    * See setSolveSettings for how the vector is ordered.
-   * 
+   *
    * @return @b vector<double>& The vector of parameter weights.
-   * 
+   *
    * @see setSolveSettings
    */
   LinearAlgebra::Vector &BundleTargetBody::parameterWeights() {
@@ -727,9 +735,9 @@ namespace Isis {
   /**
    * Returns the vector of corrections applied to the parameters.
    * See setSolveSettings for how the vector is ordered.
-   * 
+   *
    * @return @b vector<double>& The vector of parameter corrections.
-   * 
+   *
    * @see setSolveSettings
    */
   LinearAlgebra::Vector &BundleTargetBody::parameterCorrections() {
@@ -740,9 +748,9 @@ namespace Isis {
   /**
    * Returns the vector of parameters solution.
    * See setSolveSettings for how the vector is ordered.
-   * 
+   *
    * @return @b vector<double>& The vector of parameter solution.
-   * 
+   *
    * @see setSolveSettings
    */
   LinearAlgebra::Vector &BundleTargetBody::parameterSolution() {
@@ -753,9 +761,9 @@ namespace Isis {
   /**
    * Returns the vector of apriori parameters sigmas.
    * See setSolveSettings for how the vector is ordered.
-   * 
+   *
    * @return @b vector<double>& The vector of apriori parameter sigmas.
-   * 
+   *
    * @see setSolveSettings
    */
   LinearAlgebra::Vector &BundleTargetBody::aprioriSigmas() {
@@ -766,9 +774,9 @@ namespace Isis {
   /**
    * Returns the vector of adjusted parameters sigmas.
    * See setSolveSettings for how the vector is ordered.
-   * 
+   *
    * @return @b vector<double>& The vector of adjusted parameter sigmas.
-   * 
+   *
    * @see setSolveSettings
    */
   LinearAlgebra::Vector &BundleTargetBody::adjustedSigmas() {
@@ -801,15 +809,15 @@ namespace Isis {
 
   /**
    * @brief Returns the number of radius parameters being solved for.
-   * 
+   *
    * Returns the number of radius parameters being solved for
    * which is based on the target radius solve method:
    * None -> 0
    * Mean -> 1
    * All  -> 3
-   * 
+   *
    * @return @b int The number of radius parameters being solved for.
-   * 
+   *
    * @see TargetRadiiSolveMethod
    */
   int BundleTargetBody::numberRadiusParameters() {
@@ -823,7 +831,7 @@ namespace Isis {
 
   /**
    * Returns the total number of parameters being solved for.
-   * 
+   *
    * @return @b int The number of parameters being solved for.
    */
   int BundleTargetBody::numberParameters() {
@@ -833,15 +841,15 @@ namespace Isis {
 
   /**
    * @brief Returns the coefficients of the right ascension polynomial.
-   * 
+   *
    * Returns The vector of right ascension polynomial coefficients ordered as:
-   * 
+   *
    * angle,
    * velocity,
    * acceleration.
-   * 
+   *
    * Only coefficients that are being solved for will be included.
-   * 
+   *
    * @return @b vector<Angle> The right ascension polynomial coefficients.
    */
   std::vector<Angle> BundleTargetBody::poleRaCoefs() {
@@ -851,15 +859,15 @@ namespace Isis {
 
   /**
    * @brief Returns the coefficients of the declination polynomial.
-   * 
+   *
    * Returns The vector of declination polynomial coefficients ordered as:
-   * 
+   *
    * angle,
    * velocity,
    * acceleration.
-   * 
+   *
    * Only coefficients that are being solved for will be included.
-   * 
+   *
    * @return @b vector<Angle> The declination polynomial coefficients.
    */
   std::vector<Angle> BundleTargetBody::poleDecCoefs() {
@@ -869,15 +877,15 @@ namespace Isis {
 
   /**
    * @brief Returns the coefficients of the prime meridian polynomial.
-   * 
+   *
    * Returns The vector of prime meridian polynomial coefficients ordered as:
-   * 
+   *
    * angle,
    * velocity,
    * acceleration.
-   * 
+   *
    * Only coefficients that are being solved for will be included.
-   * 
+   *
    * @return @b vector<Angle> The prime meridian polynomial coefficients.
    */
   std::vector<Angle> BundleTargetBody::pmCoefs() {
@@ -887,11 +895,11 @@ namespace Isis {
 
   /**
    * @brief Returns the radius values.
-   * 
+   *
    * Returns the vector of radius values formatted as RadiusA, RadiusB, RadiusC.
-   * 
+   *
    * @return @b vector<Distance> The vector of radius values.
-   * 
+   *
    * @throws IException::Programmer "The triaxial radii can only be accessed
    *                                 when solving for triaxial radii."
    */
@@ -906,9 +914,9 @@ namespace Isis {
 
   /**
    * Returns the mean radius.
-   * 
+   *
    * @return @b Distance The mean radius.
-   * 
+   *
    * @throws IException::Programmer "The mean radius can only be accessed
    *                                 when solving for mean radius."
    */
@@ -923,13 +931,13 @@ namespace Isis {
 
   /**
    * @brief Calculates and returns the weighted sum of the squares of the corrections.
-   * 
+   *
    * Calculates and returns the weighted sum of the squares of the corrections
    * computed by V(T)*P*V where:
    * V is the vector of corrections,
    * P is the weight matrix,
    * V(T) is the transpose of V.
-   * 
+   *
    * @return @b double The weighted sum of the squares of the corrections (vtpv).
    */
   double BundleTargetBody::vtpv() {
@@ -950,9 +958,9 @@ namespace Isis {
 
   /**
    * Formats and returns the parameter values as a QString.
-   * 
+   *
    * @param errorPropagation If adjusted sigmas should be output.
-   * 
+   *
    * @return @b QString A formatted QString containing the parameter values.
    */
   QString BundleTargetBody::formatBundleOutputString(bool errorPropagation) {
@@ -1100,9 +1108,9 @@ namespace Isis {
   /**
    * Returns a list of all the parameters being solved for as QStrings.
    * This should only be called after formatBundleOutputString.
-   * 
+   *
    * @return @b QStringList A list of the parameters being solved for.
-   * 
+   *
    * @see formatBundleOutputString
    */
   QStringList BundleTargetBody::parameterList() {
@@ -1115,11 +1123,11 @@ namespace Isis {
    *
    * specifically for standard jigsaw interface, not the
    * Integrated Photogrammetric Control Environment (IPCE)
-   * 
+   *
    * @param tbObject The Pvl file to read from.
-   * 
+   *
    * @return @b bool If the solve parameters were successfuly set.
-   * 
+   *
    * @throws IException::User "Ra must be given as none, position, velocity, or acceleration"
    * @throws IException::User "Dec must be given as none, position, velocity, or acceleration"
    * @throws IException::User "Pm must be given as none, position, velocity, or acceleration"
@@ -1166,7 +1174,7 @@ namespace Isis {
    * @throws IException::User "MeanRadiusValue must be >= 0".
    * @throws IException::User "MeanRadiusSigma must be a valid double (blank defaults to 0)."
    * @throws IException::User "MeanRadiusSigma must be >= 0".
-   * 
+   *
    * @see setSolveSettings
    */
   bool BundleTargetBody::readFromPvl(PvlObject &tbObject) {
@@ -1298,7 +1306,7 @@ namespace Isis {
     Distance sigmaRadiusC;
     Distance aprioriMeanRadius;
     Distance sigmaMeanRadius;
-    
+
     //TODO Determine which need to be non-negative. JAM
 
     for (g = tbObject.beginGroup(); g != tbObject.endGroup(); ++g) {
@@ -1675,7 +1683,7 @@ namespace Isis {
    *
    * @return @b Distance The distance from the center of the ellipsoid to its surface
    *                     at the given lat/lon location.
-   * 
+   *
    * @throws IException::Programmer "Local radius can only be found if
    *                                 triaxial radii were solved for."
    */
diff --git a/isis/src/control/objs/BundleUtilities/BundleTargetBody.h b/isis/src/control/objs/BundleUtilities/BundleTargetBody.h
index 7fa8cec75f56b04cfab578cbfd71649d6b64ef6e..9f55f82a3e999c012e7a308daa654b9dec7c3261 100644
--- a/isis/src/control/objs/BundleUtilities/BundleTargetBody.h
+++ b/isis/src/control/objs/BundleUtilities/BundleTargetBody.h
@@ -1,27 +1,14 @@
 #ifndef BundleTargetBody_h
 #define BundleTargetBody_h
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2015/5/15 08:00:00 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <set>
 
 #include <QSharedPointer>
diff --git a/isis/src/control/objs/BundleUtilities/unitTest.cpp b/isis/src/control/objs/BundleUtilities/unitTest.cpp
index b765dbb86db0c14d6db1a77a3d487d68df638951..3e0d42b98d245df15bd214d21f8e0548b3b6dc9a 100755
--- a/isis/src/control/objs/BundleUtilities/unitTest.cpp
+++ b/isis/src/control/objs/BundleUtilities/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Angle.h"
 #include "BundleControlPoint.h"
 #include "BundleImage.h"
@@ -51,19 +59,19 @@ void printXml(const BundleObservationSolveSettings &);
  * @internal
  *   @history 2018-07-03 Debbie A Cook - Removed target radii. References #5457.
  *   @history 2014-12-11 - Original version.
- *   @history 2018-09-06 Debbie A. Cook - Merged dev into BundleXYZ branch 
- *                               Original branch history entry on 2017-06-26 
- *                               Updated to reflect changes made to BundleControlPoint. 
- *                               Some tests were no longer valid and new tests were added to exercise 
+ *   @history 2018-09-06 Debbie A. Cook - Merged dev into BundleXYZ branch
+ *                               Original branch history entry on 2017-06-26
+ *                               Updated to reflect changes made to BundleControlPoint.
+ *                               Some tests were no longer valid and new tests were added to exercise
  *                               the new option of adjusting in Rectangular coordinates.  The
- *                               Latitudinal covariance was being populated only along the diagonal 
- *                               (using the latitudinal sigmas).  This produced inaccurate results.  
- *                               Now it is created by converting  the rectangular covariance 
+ *                               Latitudinal covariance was being populated only along the diagonal
+ *                               (using the latitudinal sigmas).  This produced inaccurate results.
+ *                               Now it is created by converting  the rectangular covariance
  *                               matrix to latitudinal.  References #4649 and #501.
  *   @history 2018 -09-06 Debbie A. Cook - Merged dev into BundleXYZ branch
- *                               Original branch history entry on 2017-11-29 - Updated to reflect 
- *                               changes made to units of covariance matrix in SurfacePoint methods 
- *                               and removal of SurfacePoint::SetRadii method. 
+ *                               Original branch history entry on 2017-11-29 - Updated to reflect
+ *                               changes made to units of covariance matrix in SurfacePoint methods
+ *                               and removal of SurfacePoint::SetRadii method.
  *  @history 2018-09-28 Debbie A. Cook - Removed metersToRadians argument from
  *                               constructor because we are now using the local radius instead of
  *                               the target body equatorial radius to convert meters to radians.  To
@@ -119,15 +127,15 @@ namespace Isis {
  *   @history 2016-12-01 Ian Humphrey - Added extra qDebug() stream so the "apply param
  *                           corrections successful?" string will be in the unitTest output.
  *   @history 2017-04-24 Ian Humphrey - Replaced pvlObject() with XML save(). Fixes #4797.
- *   @history 2017-03-05 Debbie A. Cook - updated to conform to changes made to 
- *                            BundleControlPointConstructor.  Fixed test 
+ *   @history 2017-03-05 Debbie A. Cook - updated to conform to changes made to
+ *                            BundleControlPointConstructor.  Fixed test
  *                             "Modify FreePoint - setWeights() - solveRadius=true, apriori lat/lon/rad <= 0"
  *                             to output radius type as free instead of N/A under Inital Accuracy column and
  *                             fixed weight value to be 0.  Corrections were made by creating a new contol
  *                             point when the settings were changed instead of just calling setWeights.
- *                             Deleted tests "Modified FreePoint - setWeights, "Modify FixedPoint -  
- *                             setWeights() and ModifyConstrainedPoint - setWeights()" since 
- *                             setWeights is always called in the constructor now.  References 
+ *                             Deleted tests "Modified FreePoint - setWeights, "Modify FixedPoint -
+ *                             setWeights() and ModifyConstrainedPoint - setWeights()" since
+ *                             setWeights is always called in the constructor now.  References
  *                             #4649 and #501
  */
 int main(int argc, char *argv[]) {
@@ -459,7 +467,7 @@ int main(int argc, char *argv[]) {
     std::stringstream fpOut2;
     bo2.bundleOutputString(fpOut2, true);
     qDebug().noquote() << QString::fromStdString(fpOut2.str());
-    
+
     qDebug() << "    Set solve settings using with TWIST=FALSE...";
     bo2.setSolveSettings(bossToFill);
     bossFromBo = *bo2.solveSettings();
@@ -666,7 +674,7 @@ int main(int argc, char *argv[]) {
     bcp1.zeroNumberOfRejectedMeasures();
     qDebug() << "Zero out number of rejected measures:" << bcp1.numberOfRejectedMeasures();
 
-    // ??? these print outs are not pretty... fix??? 
+    // ??? these print outs are not pretty... fix???
     qDebug().noquote() << bcp1.formatBundleOutputSummaryString(errorProp);
     // ??? these print outs are not pretty... fix??? improved somewhat 6-9-2017
     qDebug().noquote() << bcp1.formatBundleOutputDetailString(errorProp);
@@ -678,7 +686,7 @@ int main(int argc, char *argv[]) {
     qDebug().noquote() << bcp1.formatBundleOutputDetailString(errorProp);
     qDebug() << "";
 
-// #2 Same as test 1, but assign coordinate values (0., 0., 10.) to adjusted surface points of FREE 
+// #2 Same as test 1, but assign coordinate values (0., 0., 10.) to adjusted surface points of FREE
 //       point with solve radius still false -- radius weight is fixed (1.0e+50).  Other coordinates are free
     qDebug() << "BCP test 2 - Modify FreePoint - setAdjustedSurfacePoint(0,0,10) and addMeasure()";
     SurfacePoint sp1(Latitude(0.0, Angle::Degrees),
@@ -768,9 +776,9 @@ int main(int argc, char *argv[]) {
 // #4 Test with global sigmas now.  Everything else is the same as test #3.
     qDebug() << "BCP test 4 - Create FreePoint - solveRadius=true, apriori lat/lon/rad > 0 ";
     qDebug() << "                    from globals - coordinate type = Latitudinal";
-    settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal, 
+    settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal,
                               SurfacePoint::Latitudinal, 2.0, 3.0, 4.0);
-    freePoint->SetAprioriSurfacePoint(sp1); 
+    freePoint->SetAprioriSurfacePoint(sp1);
     BundleControlPoint bcp1b(settings, freePoint);
     bcp1b.setAdjustedSurfacePoint(sp1);
     BundleMeasure bcm1b = *(bcp1b.addMeasure(cm1));
@@ -812,7 +820,7 @@ int main(int argc, char *argv[]) {
     qDebug().noquote() << bcp3a->formatBundleOutputSummaryString(errorProp);
     qDebug().noquote() << bcp3a->formatBundleOutputDetailString(errorProp);
 
-    qDebug() << "BCP test 6 - Create FixedPoint from empty fixed point, solveRadius = True";  
+    qDebug() << "BCP test 6 - Create FixedPoint from empty fixed point, solveRadius = True";
     qDebug() << " adjusted surface point (90, 180, 10)...";
 settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal,
                           SurfacePoint::Latitudinal, Isis::Null);
@@ -890,7 +898,7 @@ settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal,
     else {
       qDebug() << "weights:        NA";
     }
-        
+
     qDebug() << "";
     qDebug() << "";
 
@@ -909,12 +917,12 @@ settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal,
                                  Displacement(529.919264, Displacement::Meters), covar);
 // Extract the covar matrix converted to latitudinal coordinates now to use for test 10.
 // Usage note:  In order to get accurate results, the full correlation matrix should be
-// used as opposed to only setting the diagonal elements with the sigmas. 
+// used as opposed to only setting the diagonal elements with the sigmas.
     boost::numeric::ublas::symmetric_matrix<double, boost::numeric::ublas::upper> covarLat(3);
     covarLat.clear();
     covarLat = aprioriSurfPt.GetSphericalMatrix();
 
-// These results match what is being set in adjusted surface point.  
+// These results match what is being set in adjusted surface point.
     Angle latSigma = aprioriSurfPt.GetLatSigma();
     Angle lonSigma = aprioriSurfPt.GetLonSigma();
     Distance localRad = aprioriSurfPt.GetLocalRadiusSigma();
diff --git a/isis/src/control/objs/ControlMeasure/ControlMeasure.cpp b/isis/src/control/objs/ControlMeasure/ControlMeasure.cpp
index aac404555bede0537ac0872579a088f294342f0f..046e6e851def56e1ac4d08d2a981a29ef51ff73a 100644
--- a/isis/src/control/objs/ControlMeasure/ControlMeasure.cpp
+++ b/isis/src/control/objs/ControlMeasure/ControlMeasure.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2009/09/01 17:53:05 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "ControlMeasure.h"
 
diff --git a/isis/src/control/objs/ControlMeasure/ControlMeasure.h b/isis/src/control/objs/ControlMeasure/ControlMeasure.h
index 6c6b26a324685f6b1f276350acdb331c97c3304e..807e0990dca5e2fd971d2c9f4ddb5711158c6e93 100644
--- a/isis/src/control/objs/ControlMeasure/ControlMeasure.h
+++ b/isis/src/control/objs/ControlMeasure/ControlMeasure.h
@@ -1,27 +1,13 @@
 #ifndef ControlMeasure_h
 #define ControlMeasure_h
-/**
- * @file
- * $Revision: 1.6 $
- * $Date: 2009/09/01 17:53:05 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QObject>
 
diff --git a/isis/src/control/objs/ControlMeasure/unitTest.cpp b/isis/src/control/objs/ControlMeasure/unitTest.cpp
index b1c57e534f8dbd634f39cdea90f6fbfaefcd0f9e..87b087ca991958fd7ca607c9dbf3bb781ba4590d 100644
--- a/isis/src/control/objs/ControlMeasure/unitTest.cpp
+++ b/isis/src/control/objs/ControlMeasure/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include <float.h>
 
diff --git a/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.cpp b/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.cpp
index fc0b5482073b944b51eea29535674aee3b5d9067..9091f734a9a74beb6a471d3cb34927992c0b0f23 100644
--- a/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.cpp
+++ b/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlMeasureLogData.h"
 
 #include <QVariant>
diff --git a/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.h b/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.h
index c790d33fc2fe7ae4dad052f6725f50eaaa8cf65d..8eb505a526d10ab6dbe9af1722e255d02cdddf04 100644
--- a/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.h
+++ b/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.h
@@ -1,27 +1,13 @@
 #ifndef ControlMeasureLogData_h
 #define ControlMeasureLogData_h
-/**
- * @file
- * $Revision: 1.6 $
- * $Date: 2009/09/01 17:53:05 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 class QString;
 class QVariant;
diff --git a/isis/src/control/objs/ControlMeasureLogData/unitTest.cpp b/isis/src/control/objs/ControlMeasureLogData/unitTest.cpp
index df25d5e53487049793342d717ceaede9cf3ac7ad..fcde04ae2bd558567b8bdae92a72071f242c63a7 100644
--- a/isis/src/control/objs/ControlMeasureLogData/unitTest.cpp
+++ b/isis/src/control/objs/ControlMeasureLogData/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlMeasureLogData.h"
 
 #include <iostream>
diff --git a/isis/src/control/objs/ControlNet/ControlNet.cpp b/isis/src/control/objs/ControlNet/ControlNet.cpp
index c4ab2d53a8286e3886565421a7e1306c58483d3f..cc1361c82c48c70ea26f9c8ac8b1ae582235dc33 100644
--- a/isis/src/control/objs/ControlNet/ControlNet.cpp
+++ b/isis/src/control/objs/ControlNet/ControlNet.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ControlNet.h"
@@ -50,7 +58,7 @@ namespace Isis {
 
   //!Creates an empty ControlNet object
   ControlNet::ControlNet(SurfacePoint::CoordinateType coordType) {
-    
+
   //! Creates an empty ControlNet object
   // ControlNet::ControlNet() {
     nullify();
@@ -98,7 +106,7 @@ namespace Isis {
    */
   ControlNet::ControlNet(const QString &ptfile, Progress *progress,
                          SurfacePoint::CoordinateType coordType) {
-    
+
     nullify();
 
     points = new QHash< QString, ControlPoint * >;
@@ -106,7 +114,7 @@ namespace Isis {
 
     m_ownPoints = true;
     m_coordType = coordType;
-    
+
     try {
       ReadControl(ptfile, progress);
     }
@@ -846,7 +854,7 @@ namespace Isis {
 
 
   /**
-   * Sets the control point coordinate type 
+   * Sets the control point coordinate type
    *
    * @param coordType Control point coordinate type
    */
diff --git a/isis/src/control/objs/ControlNet/ControlNet.h b/isis/src/control/objs/ControlNet/ControlNet.h
index ae1adb546386e46ab86f3ea4e733cb7084bc5dbf..fcf476b8cae2c97f67ad0abe6bb13b1aca46a463 100644
--- a/isis/src/control/objs/ControlNet/ControlNet.h
+++ b/isis/src/control/objs/ControlNet/ControlNet.h
@@ -1,27 +1,13 @@
 #ifndef ControlNet_h
 #define ControlNet_h
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2009/07/15 17:33:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // This is needed for the QVariant macro
 #include <QMetaType>
@@ -214,9 +200,9 @@ namespace Isis {
    *   @history 2017-08-09 Summer Stapleton - Added throw to caught exception for bad control net
    *                           import in constructor. Also removed p_invalid as it was no longer
    *                           being used anywhere. Fixes #5068.
-   *   @history 2017-08-30 Debbie A. Cook - Added an optional argument to the constructor 
-   *                           for the control point coordinate type.  At this point this value is only 
-   *                           stored in the active ControlNet.  It will be added to the stored 
+   *   @history 2017-08-30 Debbie A. Cook - Added an optional argument to the constructor
+   *                           for the control point coordinate type.  At this point this value is only
+   *                           stored in the active ControlNet.  It will be added to the stored
    *                           ControlNet at a later date.  References #4649 and #501.
    *   @history 2017-12-12 Kristin Berry - Updated to use QMap and QVector rather than std::map
    *                           and std::vector. Fixes #5259.
@@ -488,7 +474,7 @@ namespace Isis {
       //!  #rejected measures
       QVector<Isis::Camera *> p_cameraList; //!< Vector of image number to camera
 
-      bool m_ownPoints; //!< Specifies ownership of point list. True if owned by this object. 
+      bool m_ownPoints; //!< Specifies ownership of point list. True if owned by this object.
       SurfacePoint::CoordinateType m_coordType; //!< The coordinate type of the control points
   };
 
diff --git a/isis/src/control/objs/ControlNet/unitTest.cpp b/isis/src/control/objs/ControlNet/unitTest.cpp
index 15c46c9c80bf9eb51b9450ed3ee13d1a7c46b478..019b1e3dba9878b203fa0a1a99af713104387c67 100644
--- a/isis/src/control/objs/ControlNet/unitTest.cpp
+++ b/isis/src/control/objs/ControlNet/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNet.h"
 
 #include <string>
diff --git a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp
index 573cc6aa3516792cfe6f5204453c9334f08e08f2..1ea671f9439bda1afd9545f119edd66150d1afbf 100644
--- a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp
+++ b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ControlNetDiff.h"
@@ -99,12 +107,12 @@ namespace Isis {
 
     Pvl net1Pvl = cnv1.toPvl();
     Pvl net2Pvl = cnv2.toPvl();
-    
+
     PvlObject &net1Obj = net1Pvl.findObject("ControlNetwork");
     PvlObject &net2Obj = net2Pvl.findObject("ControlNetwork");
-    
+
     QMap< QString, QMap<int, PvlObject> > pointMap;
-     
+
     for (int p = 0; p < net1NumPts; p++) {
       PvlObject &point = net1Obj.object(p);
       pointMap[point.findKeyword("PointId")[0]].insert(
@@ -118,7 +126,7 @@ namespace Isis {
     }
 
     QList<QString> pointNames = pointMap.keys();
- 
+
     for (int i = 0; i < pointNames.size(); i++) {
       QMap<int, PvlObject> idMap = pointMap[pointNames[i]];
       if (idMap.size() == 2) {
@@ -416,4 +424,3 @@ namespace Isis {
     m_ignoreKeys->insert("DateTime");
   }
 }
-
diff --git a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.h b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.h
index 8443bb56317c1ef1b4d57465d2b2c2f9d875dd52..3e3935ac5ef89390eec20e7e5bb577a05ffe9495 100644
--- a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.h
+++ b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.h
@@ -1,27 +1,13 @@
 #ifndef ControlNetDiff_h
 #define ControlNetDiff_h
 
-/**
- * @file
- * $Revision: 1.8 $
- * $Date: 2008/06/18 18:54:11 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 
diff --git a/isis/src/control/objs/ControlNetDiff/unitTest.cpp b/isis/src/control/objs/ControlNetDiff/unitTest.cpp
index e6d71860f5cbecb9d83ed3bfc966c3131ee62fca..7ba38927b547f2c5dde5a13df3f67f0635ca8a1b 100644
--- a/isis/src/control/objs/ControlNetDiff/unitTest.cpp
+++ b/isis/src/control/objs/ControlNetDiff/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include <float.h>
 
@@ -41,4 +49,3 @@ int main() {
 
   return 0;
 }
-
diff --git a/isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp b/isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp
index a5e80cb740fce472b3b3ea30733f90a80a196e53..76af1ea2c2207647e30a72ab08df22890ff7c9ca 100644
--- a/isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp
+++ b/isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNetFilter.h"
 
 #include <QVector>
diff --git a/isis/src/control/objs/ControlNetFilter/ControlNetFilter.h b/isis/src/control/objs/ControlNetFilter/ControlNetFilter.h
index a9b940bd96b2a48c0949042c267474b6140168b8..8de31ceb39a62bca10e9f2d0c67eaa559793276b 100644
--- a/isis/src/control/objs/ControlNetFilter/ControlNetFilter.h
+++ b/isis/src/control/objs/ControlNetFilter/ControlNetFilter.h
@@ -4,28 +4,13 @@
 #include "ControlNetStatistics.h"
 #include <fstream>
 
-/**
- * @file
- * $Revision: $
- * $Date: $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 namespace Isis {
   class ControlNet;
@@ -64,7 +49,7 @@ namespace Isis {
    *  @history 2011-10-05 Sharmila Prasad - Report double values with 10 digit precision
    *  @history 2011-11-03 Sharmila Prasad - Added functionality to filter by Convex Hull Ratio
    *  @history 2011-12-29 Sharmila Prasad - Updated GoodnessOfFit Filter. Fixes Mantis #652
-   *  @history 2017-08-08 Adam Goins - Changed references to SerialNumberList::Delete() to 
+   *  @history 2017-08-08 Adam Goins - Changed references to SerialNumberList::Delete() to
    *                           SerialNumberList::remove()
    *  @history 2017-12-12 Kristin Berry - Updated to use QVector instead of std::vector. Fixes
    *                           #5259.
@@ -80,19 +65,19 @@ namespace Isis {
       // Point Filters
       //! Filter Points by Pixel Shift
       void PointPixelShiftFilter(const PvlGroup &pvlGrp, bool pbLastFilter);
-      
+
       //! Filter Points by Edit Lock
       void PointEditLockFilter(const PvlGroup &pvlGrp, bool pbLastFilter);
 
       //! Filter Points by Measure Edit Lock number
       void PointNumMeasuresEditLockFilter(const PvlGroup &pvlGrp, bool pbLastFilter);
-      
+
       //! Filter Points by Residual Magnitude
       void PointResMagnitudeFilter(const PvlGroup &pvlGrp, bool pbLastFilter);
 
       //! Filter Points by GoodnessOfFit
       void PointGoodnessOfFitFilter(const PvlGroup & pvlGrp, bool pbLastFilter);
-      
+
       //! Filter Points by Point ID Expression
       void PointIDFilter(const PvlGroup &pvlGrp, bool pbLastFilter);
 
@@ -129,7 +114,7 @@ namespace Isis {
 
       //! Filter Cubes by Distance between points in a Cube
       void CubeDistanceFilter(const PvlGroup &pvlGrp, bool pbLastFilter);
-      
+
       //! Filter Cubes by its ConvexHull Ratio
       void CubeConvexHullFilter(const PvlGroup &pvlGrp, bool pbLastFilter);
 
@@ -144,7 +129,7 @@ namespace Isis {
     private:
       std::ofstream mOstm;                     //!< output stream for printing to output file
       SerialNumberList mSerialNumFilter;  //!< Serial Number List file
-      
+
       void FilterOutPoint(int pindex);
       void FilterOutMeasuresBySerialNum(QString serialNum);
   };
diff --git a/isis/src/control/objs/ControlNetFilter/unitTest.cpp b/isis/src/control/objs/ControlNetFilter/unitTest.cpp
index c92f515be7e382eb390e33c82a6f6c2d8823ba23..3bb077f67de7596500ab2ddc6c1c2ddf618f931e 100644
--- a/isis/src/control/objs/ControlNetFilter/unitTest.cpp
+++ b/isis/src/control/objs/ControlNetFilter/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "IsisDebug.h"
 #include "Application.h"
diff --git a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp
index b502cb035af122070fe7a2eb263fda9e42447f58..dfe54a19ffc005ed1bee1862b5ad5dce4e58230a 100644
--- a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp
+++ b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNetStatistics.h"
 
 #include <QDebug>
diff --git a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.h b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.h
index 79244cd53d5c1a6d4409b795348953b94181a9c6..3709011573f83447f69fa8bd0df6e73d0cb64da7 100644
--- a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.h
+++ b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.h
@@ -1,38 +1,22 @@
 #ifndef _CONTROLNETSTATISTICS_H_
 #define _CONTROLNETSTATISTICS_H_
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QMap>
-#include <QVector> 
+#include <QVector>
 
 #include "Progress.h"
 #include "PvlGroup.h"
 #include "SerialNumberList.h"
 #include "Statistics.h"
 
-
-/**
- * @file
- * $Revision: $
- * $Date: $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
-
 namespace Isis {
   class ControlNet;
   class Progress;
diff --git a/isis/src/control/objs/ControlNetStatistics/unitTest.cpp b/isis/src/control/objs/ControlNetStatistics/unitTest.cpp
index be25657e850aaf0c33e670730c017adc00a1e632..dfaf6fbde8475a64ab92e05c99df2001731049b0 100644
--- a/isis/src/control/objs/ControlNetStatistics/unitTest.cpp
+++ b/isis/src/control/objs/ControlNetStatistics/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "IsisDebug.h"
 #include "Application.h"
diff --git a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp
index ede97e14ba3aa69caa673815249a395dc29f1ab8..35466def105e3a2750eb59eba46a1b1350d845dc 100644
--- a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp
+++ b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNetValidMeasure.h"
 #include "Cube.h"
 #include "Camera.h"
@@ -935,4 +943,3 @@ namespace Isis {
     }
   }
 };
-
diff --git a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h
index 9f2fdd5c1531f31a15a24dd8e74d1be2647b3621..4da11e7cc659118c648a315a760763ec5ccada30 100644
--- a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h
+++ b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h
@@ -1,6 +1,14 @@
 #ifndef _ControlNetValidMeasure_h_
 #define _ControlNetValidMeasure_h_
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CubeManager.h"
 #include "IString.h"
 #include "Pvl.h"
@@ -8,28 +16,13 @@
 #include "Progress.h"
 #include "SerialNumberList.h"
 
-/**
- * @file
- * $Revision: $
- * $Date: $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 namespace Isis {
   class Camera;
@@ -71,7 +64,7 @@ namespace Isis {
     *                          ValidMeasure Group is found. Fixes Mantis #584
     *  @history 2013-01-31 Steven Lambright - Fixed LocationString() to return
     *                          valid text. Also, added a test for this text.
-    *                          Fixes #1436. 
+    *                          Fixes #1436.
     *  @history 2014-03-03 Janet Barrett - Initialize the mdDnValue variable in
     *                          the ValidStandardOptions method. Fixes #2040.
     *  @history 2016-07-13 Adam Paquette - Updated ValidStandardOptions to only
@@ -85,10 +78,10 @@ namespace Isis {
       ControlNetValidMeasure(Pvl &pvl);
 
       //! Initialize the Standard Options
-      void InitStdOptions(void);         
-      
+      void InitStdOptions(void);
+
       //! Initialize the Standard Options Pvl Group with no DefFile
-      void InitStdOptionsGroup(void);    
+      void InitStdOptionsGroup(void);
 
       virtual ~ControlNetValidMeasure();
 
@@ -105,25 +98,25 @@ namespace Isis {
 
       //! Validate whether the Emission Angle is in the set Range
       bool ValidEmissionAngle(double pdEmissionAngle);
-      
+
       //! Validate whether the Incidence Angle is in the set Range
       bool ValidIncidenceAngle(double pdIncidenceAngle);
-      
+
       //! Validate whether the DN Value is in the set Range
       bool ValidDnValue(double pdDnValue);
-      
+
       //! Validate whether the Resolution is in the set Range
       bool ValidResolution(double pdResolution);
-      
+
       //! Validate whether the Residuals are within the set Tolerance
-      bool ValidResidualTolerances(double pdSampleResidual, double pdLineResidual, 
+      bool ValidResidualTolerances(double pdSampleResidual, double pdLineResidual,
                      double pdResidualMagnitude, MeasureValidationResults & pResults);
 
       bool ValidShiftTolerances(double sampleShift, double lineShift,
           double pixelShift, MeasureValidationResults &results);
-      
+
       //! Validate the Lat/Lon
-      bool ValidLatLon(Isis::Camera *pCamera, int piSample, int piLine); 
+      bool ValidLatLon(Isis::Camera *pCamera, int piSample, int piLine);
 
       //! Get the Standard Options Pvl Group
       PvlGroup &GetStdOptions(void) {
@@ -193,17 +186,17 @@ namespace Isis {
       //! Validate Standard options to pick a reference based on a particular criteria
       MeasureValidationResults ValidStandardOptions(const ControlMeasure *pMeasure,
           Cube *pCube, Camera *camera, PvlGroup *pMeasureGrp = NULL);
-      
+
       //! Validate Standard options to pick a reference based on a particular criteria
-      MeasureValidationResults ValidStandardOptions(double pSample, double pLine, 
+      MeasureValidationResults ValidStandardOptions(double pSample, double pLine,
           const ControlMeasure *pMeasure, Cube *pCube, PvlGroup *pMeasureGrp = NULL);
 
-      MeasureValidationResults ValidStandardOptions(double pSample, double pLine, 
+      MeasureValidationResults ValidStandardOptions(double pSample, double pLine,
           const ControlMeasure *pMeasure, Cube *pCube, Camera *measureCamera,
           PvlGroup *pMeasureGrp = NULL);
-      
+
       //! Validate Standard options to pick a reference based on a particular criteria
-      MeasureValidationResults ValidStandardOptions(double pSample, double pLine, 
+      MeasureValidationResults ValidStandardOptions(double pSample, double pLine,
                                           Cube *pCube, PvlGroup *pMeasureGrp = NULL);
 
       bool IsCubeRequired() {
@@ -212,10 +205,10 @@ namespace Isis {
 
       /**
        * API to get status of CameraRequired flag
-       * 
+       *
        * @author Sharmila Prasad (5/19/2011)
-       * 
-       * @return bool 
+       *
+       * @return bool
        */
       bool IsCameraRequired() {
         return mbCameraRequired;
@@ -224,40 +217,40 @@ namespace Isis {
     protected:
       //! Validate PVL Min & Max DN Standard Options
       void ValidatePvlDN(void);
-      
+
       //! Validate PVL Min & Max EmissionAngle Standard Options
       void ValidatePvlEmissionAngle(void);
-      
+
       //! Validate PVL Min & Max IncidenceAngle Standard Options
       void ValidatePvlIncidenceAngle(void);
-      
+
       //! Validate PVL Min & Max Resolution Standard Options
       void ValidatePvlResolution(void);
-      
+
       //! Validate and read Pixels and Meters from Edge Standard Options
       void ValidatePvlFromEdge(void);
-      
+
       //! Validate Pvl Sample, Line, Residual Magnitude Tolerances
       void ValidatePvlResidualTolerances(void);
 
       void ValidatePvlShiftTolerances();
-      
+
       //! Read the Serial Numbers from the file and open assocaited cubes
       void ReadSerialNumbers(QString psSerialNumfile);
-      
+
       /**
-       * Set the CameraRequired Flag. This flag indicates whether a camera is required 
-       * to Validate a Control Measure. Camera is required to get Emission, Incidence 
-       * angles and Resolution 
-       * 
+       * Set the CameraRequired Flag. This flag indicates whether a camera is required
+       * to Validate a Control Measure. Camera is required to get Emission, Incidence
+       * angles and Resolution
+       *
        * @author Sharmila Prasad (5/19/2011)
-       * 
-       * @param pbFlag 
+       *
+       * @param pbFlag
        */
       void SetCameraRequiredFlag(bool pbFlag){
         mbCameraRequired = pbFlag;
       }
-      
+
       double mdMinDN;                  //!< Standard Option MinDN
       double mdMaxDN;                  //!< Standard Option MaxDN
       double mdMinResolution;          //!< Standard Option MinResolution
@@ -296,11 +289,10 @@ namespace Isis {
       CubeManager mCubeMgr;            //!< CubeManager to open and read cubes
       SerialNumberList mSerialNumbers; //!< Serial numbers list
 
-      bool mbCameraRequired;           //!< To improve speed, flag to indicate if 
+      bool mbCameraRequired;           //!< To improve speed, flag to indicate if
                                        //!< Camera needs to be opened
       bool mbValidateDN;               //!< Check if DN needs to be Validated
       bool mbValidateFromEdge;         //!< Check if Pixels/Meters from edge needs to be Validated
   };
 };
 #endif
-
diff --git a/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.cpp b/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.cpp
index dcb94def7a2494acfa2d60c31e8ba546fee8c2f5..2ac3fa4a314e75d8653070ee5d745dce60f15477 100644
--- a/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.cpp
+++ b/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MeasureValidationResults.h"
 
 #include <QString>
@@ -121,4 +129,3 @@ namespace Isis {
     return ((errorMsg->isEmpty()) ? "failed: " : "") + optString;
   }
 };
-
diff --git a/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.h b/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.h
index a7f66178e8900e1c828c4375014fa8c822263050..ccbb05dccebde2559b01954e1257f8be50f241ec 100644
--- a/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.h
+++ b/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.h
@@ -1,31 +1,17 @@
 #ifndef _MeasureValidationResults_h_
 #define _MeasureValidationResults_h_
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 class QString;
 template< class T > class QVector;
 
-/**
- * @file
- * $Revision: $
- * $Date: $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
 namespace Isis {
   /**
    * @brief MeasureValidationResults class
@@ -81,4 +67,3 @@ namespace Isis {
 };
 
 #endif
-
diff --git a/isis/src/control/objs/ControlNetValidMeasure/unitTest.cpp b/isis/src/control/objs/ControlNetValidMeasure/unitTest.cpp
index 1298786547c25fbd14e4d3592e0b1a5b884a73b4..0ba64dcd431520c4deeb2a699d2fa083b3360c2e 100644
--- a/isis/src/control/objs/ControlNetValidMeasure/unitTest.cpp
+++ b/isis/src/control/objs/ControlNetValidMeasure/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNetValidMeasure.h"
 #include "Preference.h"
 #include "IException.h"
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp b/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp
index b71b779954abd857fcb76bb0a16b21f6a577687d..9f3e0a4c312ea0187ed6883df9a945b5fe422c9d 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp
+++ b/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNetVersioner.h"
 
 #include <boost/numeric/ublas/symmetric.hpp>
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h b/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h
index 4623cfff02c423923bb436c441a20781e409cdf7..c39dc83457be897962be0882dec262ceff506aa5 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h
+++ b/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h
@@ -1,27 +1,13 @@
 #ifndef ControlNetVersioner_h
 #define ControlNetVersioner_h
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2009/07/15 17:33:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 
@@ -399,13 +385,13 @@ namespace Isis {
    *                           Target::GetRadii calls to speed up createPoint().
    *   @history 2018-01-12 Adam Goins - Added Progress during reads.
    *   @history 2018-01-24 Jesse Mapel - Fixed c++11 build warnings.
-   *                         
+   *
    *   @history 2018-01-27 Jesse Mapel - Fixed some documentation formatting. Added a section
    *                           describing the different file format versions.
    *   @history 2018-01-30 Adam Goins - Ensured point sizes are written/read as lsb by using
    *                           EndianSwapper.
-   *   @history 2018-02-25 Debbie A. Cook - Generalized calls to 
-   *                           ControlPoint::IsLatitudeConstrained to IsCoord1Constained 
+   *   @history 2018-02-25 Debbie A. Cook - Generalized calls to
+   *                           ControlPoint::IsLatitudeConstrained to IsCoord1Constained
    *                           and added or updated a few comments. *** TODO *** make sure
    *                           the new methods are fully functional for either coordinate type
    *                           once the new header keyword is added.
@@ -416,11 +402,11 @@ namespace Isis {
    *                           so that these values can be grabbed from a ControlNet on read.
    *                           Also Fixes #5361.
    *   @history 2018-06-01 Debbie A. Cook - (added to BundleXYZ 2018-02-25)
-   *                           Generalized calls to ControlPoint::IsLatitudeConstrained to 
+   *                           Generalized calls to ControlPoint::IsLatitudeConstrained to
    *                           IsCoord1Constained and added or updated a few comments.
    *                           *** TODO *** make sure the new methods are fully functional
    *                           for either coordinate type once the new header keyword is added.
-   *                           
+   *
    *   @history 2018-07-03 Jesse Mapel - Removed target radii from versioner. References #5457.
    */
   class ControlNetVersioner {
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp b/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp
index 4d63de49749e0e41df1f6d27b47045169542e417..77ff48adb1c2b2be55fdde2a50957594dfbcc286 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp
+++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlPointV0001.h"
 
 #include <QString>
@@ -36,7 +44,7 @@ namespace Isis {
    * Create a ControlPointV0001 object from a version 1 control point Pvl object
    *
    * @param pointObject The control point and its measures in a Pvl object
-   * @param targetName The name of the target 
+   * @param targetName The name of the target
    */
   ControlPointV0001::ControlPointV0001(PvlObject &pointObject, const QString targetName)
       : m_pointData(new ControlNetFileProtoV0001_PBControlPoint),
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.h b/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.h
index a2caa40dca4574e72a082f37dd9617333fa19d1b..7df1f7b4e80f3cf13f2845a2cae92188ccaf28f0 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.h
+++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.h
@@ -1,27 +1,13 @@
 #ifndef ControlPointV0001_h
 #define ControlPointV0001_h
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2009/07/15 17:33:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
  #include <QSharedPointer>
 
@@ -69,7 +55,7 @@ namespace Isis {
    *                                                   SurfacePoint::SetRadii.  References #5457.
    *   @history 2018-07-11 Debbie A Cook - Removed obsolete tests for failure
    *                                                   due to missing target radii.  SurfacePoint
-   *                                                   now uses the local radius of the point to 
+   *                                                   now uses the local radius of the point to
    *                                                   convert sigmas to target radii are no longer
    *                                                   used.  References #5457
    */
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp b/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp
index a4d088bea90b06dc5dab7e13061631aff442a9c8..d78e5c5de57a7965a8b86061e1af59e9d12641e0 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp
+++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlPointV0002.h"
 
 #include <QString>
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h b/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h
index 95d18e5077731d6a796993f221f98de01f5333d7..9eb764f775a2388a61b12068442b84a40b860474 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h
+++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h
@@ -1,27 +1,13 @@
 #ifndef ControlPointV0002_h
 #define ControlPointV0002_h
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2009/07/15 17:33:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
  #include <QSharedPointer>
 
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp b/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp
index 86b3526a5f43c876b1a3bc947283ffe3a59a7394..cfc28a21a8c2e4fde6fc03475bd9176de48d23e3 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp
+++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlPointV0003.h"
 
 #include <QString>
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h b/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h
index e01ad9b747fa7476e74277e230337f75008b2d75..57b7df1c4b9744d03ac9f1bec9b34d587a278c4d 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h
+++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h
@@ -1,27 +1,13 @@
 #ifndef ControlPointV0003_h
 #define ControlPointV0003_h
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2009/07/15 17:33:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QSharedPointer>
 
diff --git a/isis/src/control/objs/ControlNetVersioner/unitTest.cpp b/isis/src/control/objs/ControlNetVersioner/unitTest.cpp
index 677a0cd4b8a65cf7a1d7303abd9bf84371fb93e3..43bad6df413e5ef2bbb88cd7c84aa6020c2d0f60 100644
--- a/isis/src/control/objs/ControlNetVersioner/unitTest.cpp
+++ b/isis/src/control/objs/ControlNetVersioner/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNetVersioner.h"
 
 #include <QString>
@@ -16,82 +24,82 @@ using namespace Isis;
 
 void TestNetwork(const QString &filename, Progress *progress, bool printNetwork = true, bool pvlInput = false);
 
-/** 
+/**
  * Unit test for ControlNetVersioner class
- *  
- * @author ????-??-?? Unknown 
- *  
+ *
+ * @author ????-??-?? Unknown
+ *
  *  @internal
  *   @history 2018-06-06 Jeannie Backer - Removed file paths from error message written to
  *                           test output.
- *  
+ *
  */
 int main(int argc, char *argv[]) {
   Preference::Preferences(true);
   Progress *testProgress = new Progress();
   cout << "Test ControlNetVersioner";
 
-  // No target                                                  
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork2_PvlV0001.net", 
+  // No target
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork2_PvlV0001.net",
               testProgress, false); // no print network here because the datetimes will change
 
-  // Really odd keywords with target                            
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork3_PvlV0001.net", 
-              testProgress);               
+  // Really odd keywords with target
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork3_PvlV0001.net",
+              testProgress);
 
-  // Another set of odd keywords                                
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork1_PvlV0001.net", 
-              testProgress);               
+  // Another set of odd keywords
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork1_PvlV0001.net",
+              testProgress);
 
-  // Binary V1                                                  
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork1_ProtoV0001.net", 
-              testProgress);           
+  // Binary V1
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork1_ProtoV0001.net",
+              testProgress);
 
-  // Corrupted (based off of oldNetwork2.net)                   
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_BadNetwork_ProtoV0001.net", 
-              testProgress);              
+  // Corrupted (based off of oldNetwork2.net)
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_BadNetwork_ProtoV0001.net",
+              testProgress);
 
-  // Binary V2                                                  
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork2_ProtoV0002.net", 
-              testProgress, 
-              false);    
+  // Binary V2
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork2_ProtoV0002.net",
+              testProgress,
+              false);
 
-  // Network with rejected jigsaw points                        
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork8_PvlV0005.pvl", 
-              testProgress, 
-              true, 
-              true);   
+  // Network with rejected jigsaw points
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork8_PvlV0005.pvl",
+              testProgress,
+              true,
+              true);
 
-  // Network full of weird test cases (based on PvlNetwork4)    
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork5_PvlV0003.pvl", 
+  // Network full of weird test cases (based on PvlNetwork4)
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork5_PvlV0003.pvl",
               testProgress,
-              false, 
+              false,
               false);
 
   // Test Network 1 created for code coverage.
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/PvlNet_TestNetwork1_V2.net", 
-              testProgress, 
-              false, 
-              false); 
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/PvlNet_TestNetwork1_V2.net",
+              testProgress,
+              false,
+              false);
 
   // Test Network 2 created for code coverage.
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/PvlNet_TestNetwork2_V3.net", 
-              testProgress, 
-              false, 
-              false); 
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/PvlNet_TestNetwork2_V3.net",
+              testProgress,
+              false,
+              false);
 
   // Re-test each version without progress
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork3_PvlV0001.net", 
-              0, 
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork3_PvlV0001.net",
+              0,
               false);
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork1_ProtoV0001.net", 
-              0, 
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork1_ProtoV0001.net",
+              0,
               false);
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork2_ProtoV0002.net", 
-              0, 
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork2_ProtoV0002.net",
+              0,
               false);
-  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork4_PvlV0003.pvl", 
-              0, 
+  TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork4_PvlV0003.pvl",
+              0,
               false);
 
   cout << endl << "Test writing from ControlNet objects" << endl << endl;
@@ -217,11 +225,11 @@ int main(int argc, char *argv[]) {
 
 
 /**
- * Runs various test on the given network. 
- *  
+ * Runs various test on the given network.
+ *
  * @param filename Name of the control network file.
- * @param progress 
- * @param printNetwork Indicates whether to print the network as 
+ * @param progress
+ * @param printNetwork Indicates whether to print the network as
  *                     a PVL.
  * @param pvlInput Indicates whether the given network is in PVL
  *                 format.
diff --git a/isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp b/isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp
index 9f6b66f80ca202be898aa77b750cd0d01aba3427..2c726fd1af451d334dca0f6c77663b05c7daa730 100644
--- a/isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp
+++ b/isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNetVitals.h"
 
 #include <QDateTime>
diff --git a/isis/src/control/objs/ControlNetVitals/ControlNetVitals.h b/isis/src/control/objs/ControlNetVitals/ControlNetVitals.h
index b0528c100e887df9bbf218d8c02ce85448760dc5..dcd70604e1d76558012e70837fcc68bfc95559da 100644
--- a/isis/src/control/objs/ControlNetVitals/ControlNetVitals.h
+++ b/isis/src/control/objs/ControlNetVitals/ControlNetVitals.h
@@ -1,27 +1,13 @@
 #ifndef ControlNetVitals_h
 #define ControlNetVitals_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2010/06/28 17:15:01 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc/documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QStringList>
 
diff --git a/isis/src/control/objs/ControlNetVitals/unitTest.cpp b/isis/src/control/objs/ControlNetVitals/unitTest.cpp
index 74c48a9860bef86c65d69e148f84fd9d604b209a..3722fd50827cf52fbd8a6f93824cb590809edec5 100644
--- a/isis/src/control/objs/ControlNetVitals/unitTest.cpp
+++ b/isis/src/control/objs/ControlNetVitals/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <string>
 #include <iostream>
 
@@ -14,8 +22,8 @@ using namespace Isis;
 using namespace std;
 
 /**
- * Unit test for ControlNetVitals class 
- *  
+ * Unit test for ControlNetVitals class
+ *
  * @author 2018-06-18 Adam Goins
  * @internal
  *   @history 2018-06-22 Kristin Berry - Upated after fix to numImagesBelowMeasureThreshold()
diff --git a/isis/src/control/objs/ControlPoint/ControlPoint.cpp b/isis/src/control/objs/ControlPoint/ControlPoint.cpp
index 0ad026f7563b3e697f68cea7bab3ea7adf6c6d99..8c934eb2196c048929feeb38dd14fbd2161d2674 100644
--- a/isis/src/control/objs/ControlPoint/ControlPoint.cpp
+++ b/isis/src/control/objs/ControlPoint/ControlPoint.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 #include "ControlPoint.h"
 
@@ -839,7 +847,7 @@ namespace Isis {
   }
 
 
-  /**    
+  /**
    * Computes a priori lat/lon/radius point coordinates by determining the average lat/lon/radius of
    * all measures. Note that this does not change ignored, fixed or constrained points.
    *
@@ -1003,12 +1011,12 @@ namespace Isis {
    * @history 2012-01-18 Debbie A. Cook, Revised to call
    *                            ComputeResidualsMillimeters() to avoid duplication of code.
    * @history 2019-05-16 Debbie A. Cook, The calls to CameraGroundMap::GetXY
-   *                           were changed to allow not testing for points on the back side of the 
-   *                           planet during bundle adjustment.  Now, the instrument coordinates 
+   *                           were changed to allow not testing for points on the back side of the
+   *                           planet during bundle adjustment.  Now, the instrument coordinates
    *                           will be calculated and returned always to this method. In the future,
-   *                           a separate diagnostic tool may be helpful to check for non-visable  
+   *                           a separate diagnostic tool may be helpful to check for non-visable
    *                           points in a control net AFTER bundle adjustment. References #2591.
-   *                            
+   *
    */
   ControlPoint::Status ControlPoint::ComputeResiduals() {
     if (IsIgnored()) {
diff --git a/isis/src/control/objs/ControlPoint/ControlPoint.h b/isis/src/control/objs/ControlPoint/ControlPoint.h
index fd9cc9e1d2a92418cbb63370e66a9031e2e9b94c..c8d5121ba5f8f1a3b7bd7709a0ab91871d1d6356 100644
--- a/isis/src/control/objs/ControlPoint/ControlPoint.h
+++ b/isis/src/control/objs/ControlPoint/ControlPoint.h
@@ -1,28 +1,13 @@
 #ifndef ControlPoint_h
 #define ControlPoint_h
 
-/**
- * @file
- * $Revision: 1.14 $
- * $Date: 2009/09/08 17:38:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <bitset>
 
@@ -363,7 +348,7 @@ namespace Isis {
    *                           #2591). Added check to IsConstrained() method to see if point type is
    *                           Free, in which case we ignore stored a priori sigmas on the
    *                           coordinates.
-   *  @history 2019-05-16 Debbie A. Cook  See history entry for ComputeResiduals.  Modified call to 
+   *  @history 2019-05-16 Debbie A. Cook  See history entry for ComputeResiduals.  Modified call to
    *                           CameraGroundMap to not do back-of-planet test. References #2591.
    */
   class ControlPoint : public QObject {
diff --git a/isis/src/control/objs/ControlPoint/unitTest.cpp b/isis/src/control/objs/ControlPoint/unitTest.cpp
index 6ad1b08a340231c5d0a07e431a2b6dd3644317ed..45dddb9951e1b95ce06cec8b818f1633dabc0ea6 100644
--- a/isis/src/control/objs/ControlPoint/unitTest.cpp
+++ b/isis/src/control/objs/ControlPoint/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 
 #include <boost/numeric/ublas/symmetric.hpp>
diff --git a/isis/src/control/objs/ControlPointList/ControlPointList.cpp b/isis/src/control/objs/ControlPointList/ControlPointList.cpp
index b6553ece3bb3702b773226d78bf94fbf281cb98c..bfd49558034a19ab5d42ed0b302c7932f72ace66 100644
--- a/isis/src/control/objs/ControlPointList/ControlPointList.cpp
+++ b/isis/src/control/objs/ControlPointList/ControlPointList.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlPointList.h"
 
 #include <QList>
@@ -134,4 +142,3 @@ namespace Isis {
     pcPvlLog += Isis::PvlKeyword("InvalidPointIds", sPointsNotFound);
   }
 }
-
diff --git a/isis/src/control/objs/ControlPointList/ControlPointList.h b/isis/src/control/objs/ControlPointList/ControlPointList.h
index 05a71273f84d26236e4d7e7fd38990ac133f5a64..083439e97dc588ab609ebfc2147610125a5b0721 100644
--- a/isis/src/control/objs/ControlPointList/ControlPointList.h
+++ b/isis/src/control/objs/ControlPointList/ControlPointList.h
@@ -1,27 +1,13 @@
 #ifndef ControlPointList_h
 #define ControlPointList_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2010/06/28 17:15:01 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc/documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QStringList>
 #include <QVector>
@@ -68,7 +54,7 @@ namespace Isis {
 
       //! holds one to one correspondence with "mqCpList" on
       //! whether the point was valid
-      QVector<bool> mbFound; 
+      QVector<bool> mbFound;
   };
 };
 
diff --git a/isis/src/control/objs/ControlPointList/unitTest.cpp b/isis/src/control/objs/ControlPointList/unitTest.cpp
index cf66d58666b668c7956ac7bfebb3f3daa84225ff..4315dd29afaab3daf813d405ef3079fae3ff83c6 100644
--- a/isis/src/control/objs/ControlPointList/unitTest.cpp
+++ b/isis/src/control/objs/ControlPointList/unitTest.cpp
@@ -1,11 +1,19 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlPointList.h"
 
 #include <string>
 #include <iostream>
 
 #include "IException.h"
-#include "FileName.h" 
-#include "Preference.h" 
+#include "FileName.h"
+#include "Preference.h"
 
 using namespace Isis;
 using namespace std;
diff --git a/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.cpp b/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.cpp
index 5b0ec3bac75cf3bbf1c1d892a9a1de2b1be6bdbc..c32a20243b778c1012ae54178add07463d17d099 100644
--- a/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.cpp
+++ b/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CorrelationMatrix.h"
 
 #include <QDataStream>
@@ -19,8 +27,8 @@ namespace Isis {
    * Default Constructor
    */
   CorrelationMatrix::CorrelationMatrix() {
-    m_covarianceFileName = new FileName(""); 
-    m_correlationFileName = new FileName(""); 
+    m_covarianceFileName = new FileName("");
+    m_correlationFileName = new FileName("");
     m_visibleBlocks = new QList<SparseBlockColumnMatrix>();
     m_imagesAndParameters = new QMap<QString, QStringList>();
     m_diagonals = new QList<double>();
@@ -78,7 +86,7 @@ namespace Isis {
       QString msg = "Could not find the Covariance Matrix .dat file name.";
       throw IException(e, IException::User, msg, _FILEINFO_);
     }
-    
+
     try {
       QString corrFileName = storedMatrixData.findKeyword("CorrelationMatrixFileName")[0];
       if (corrFileName == "NULL") {
@@ -159,19 +167,19 @@ namespace Isis {
       delete m_imagesAndParameters;
       m_imagesAndParameters = NULL;
       m_imagesAndParameters = new QMap<QString, QStringList>(*other.m_imagesAndParameters);
-  
+
       delete m_covarianceFileName;
       m_covarianceFileName = NULL;
       m_covarianceFileName = new FileName(*other.m_covarianceFileName);
-  
+
       delete m_correlationFileName;
       m_correlationFileName = NULL;
       m_correlationFileName = new FileName(*other.m_correlationFileName);
-  
+
       delete m_diagonals;
       m_diagonals = NULL;
       m_diagonals = new QList<double>(*other.m_diagonals);
-  
+
       delete m_visibleBlocks;
       m_visibleBlocks = NULL;
       m_visibleBlocks = new QList<SparseBlockColumnMatrix>(*other.m_visibleBlocks);
@@ -241,7 +249,7 @@ namespace Isis {
       while ( block.hasNext() ) { // each block in the column
         block.next();
         for (int row = 0; row < (int)block.value()->size1(); row++) { // each row in the block
-          for (int column = 0; column < (int)block.value()->size2(); column++) { // each column 
+          for (int column = 0; column < (int)block.value()->size2(); column++) { // each column
             // correlation = covariance / (variance1 * variance2)
             ( *block.value() )(row, column) = ( *block.value() )(row, column) /
                                               sqrt( (*m_diagonals)[param1] *
@@ -262,7 +270,7 @@ namespace Isis {
       outStream << sbcm;
       m_visibleBlocks->append(sbcm);
     }
-    
+
     // close file
     matrixInput.close();
     matrixOutput.close();
@@ -376,7 +384,7 @@ namespace Isis {
     }
     else {
       *m_imagesAndParameters = imagesAndParameters;
-    }      
+    }
   }
 
 
@@ -455,19 +463,19 @@ namespace Isis {
    * Object = CorrelationMatrixData
    *   CovarianceMatrixFileName = /location/covarianceTmpFileName.dat
    *   CorrelationMatrixFileName = /location/correlationTmpFileName.dat
-   * 
+   *
    *   Group = ImagesAndParameters
    *     Image1Name = "Param1, Param2, ..., ParamN"
    *     ...
    *     ImageNName = "..."
    *   End_Group
    * End_Object
-   * 
+   *
    * @return @b PvlGroup Returns the information needed to recreate this correlation matrix.
    */
   PvlObject CorrelationMatrix::pvlObject() {
     PvlObject corrMatInfo("CorrelationMatrixData");
-    
+
     corrMatInfo += PvlKeyword( "CovarianceMatrixFileName", m_covarianceFileName->expanded() );
     corrMatInfo += PvlKeyword( "CorrelationMatrixFileName", m_correlationFileName->expanded() );
 
@@ -478,7 +486,7 @@ namespace Isis {
       imgsAndParams += PvlKeyword( imgParamIt.key(), imgParamIt.value().join(",") );
     }
     corrMatInfo += imgsAndParams;
-    
+
     return corrMatInfo;
   }
 }
diff --git a/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.h b/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.h
index d7a55ad3c02ec4b2ca5fa5a2fa37a1f914a244b5..c17fc395a823d0893ab2936dd0e2efae2ed5ba39 100644
--- a/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.h
+++ b/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.h
@@ -1,24 +1,13 @@
 #ifndef CorrelationMatrix_h
 #define CorrelationMatrix_h
 
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FileName.h"
 
@@ -75,7 +64,7 @@ namespace Isis {
       CorrelationMatrix(PvlObject storedMatrixData);
       CorrelationMatrix(const CorrelationMatrix &other);
       ~CorrelationMatrix();
-      
+
       CorrelationMatrix &operator=(const CorrelationMatrix &other);
 
       void computeCorrelationMatrix();
diff --git a/isis/src/control/objs/CorrelationMatrix/unitTest.cpp b/isis/src/control/objs/CorrelationMatrix/unitTest.cpp
index 89de1965c262f83a93e4b2ea22eae31d5dea4a27..1765dc2e3ba3031163f97649b1a89ce2b698e353 100644
--- a/isis/src/control/objs/CorrelationMatrix/unitTest.cpp
+++ b/isis/src/control/objs/CorrelationMatrix/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 
 #include <boost/numeric/ublas/symmetric.hpp>
@@ -18,9 +26,9 @@ using namespace boost::numeric::ublas;
 using namespace Isis;
 
 int main() {
-  Preference::Preferences(true);  
+  Preference::Preferences(true);
   qDebug() << "Test Default Constructor";
-  
+
   CorrelationMatrix corrMat;
 
   qDebug() << "Test Copy Constructor";
@@ -33,9 +41,9 @@ int main() {
                      "Failed to create object with copy constructor",
                      _FILEINFO_);
   }
-  
+
   qDebug() << "Test Equal Operator ( = )";
-  
+
   try {
     CorrelationMatrix corrMat3 = corrMat;
   }
@@ -108,7 +116,7 @@ int main() {
   }
 
   qDebug() << "Does the matrix exist?" << corrMat.isValid();
- 
+
   QMap<QString, QStringList> imgsAndParams;
 
   QStringList param;
@@ -222,9 +230,9 @@ int main() {
    }
 
 
-    
+
   //delete mat files
   covQFile.remove();
   QFile(corrMat.correlationFileName().expanded()).remove();
-  
+
 }
diff --git a/isis/src/control/objs/InterestOperator/InterestOperator.cpp b/isis/src/control/objs/InterestOperator/InterestOperator.cpp
index bd885055cd1169cbaf1c5e8273827e5d4065f6b9..59b68b42d751fe14d75a3a6f59c8990949539cdf 100644
--- a/isis/src/control/objs/InterestOperator/InterestOperator.cpp
+++ b/isis/src/control/objs/InterestOperator/InterestOperator.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Chip.h"
 #include "Pvl.h"
 #include "InterestOperator.h"
diff --git a/isis/src/control/objs/InterestOperator/InterestOperator.h b/isis/src/control/objs/InterestOperator/InterestOperator.h
index 438888c6a9468ab6e7295a0a0ba8ad7a19aa89a1..f2b18a1f8afa5a87d9964d217b3c84f506e47de2 100644
--- a/isis/src/control/objs/InterestOperator/InterestOperator.h
+++ b/isis/src/control/objs/InterestOperator/InterestOperator.h
@@ -1,27 +1,13 @@
 #ifndef InterestOperator_h
 #define InterestOperator_h
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2010/07/02 23:38:14 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -118,14 +104,14 @@ namespace Isis {
    *                           InterestByPoint(). References #825.
    *   @history 2014-03-03 Janet Barrett - Changed the FindCnetRef method to report status on number
    *                           of points processed instead of number of measures. Fixes #2040.
-   *  
+   *
    */
   class InterestOperator : public ControlNetValidMeasure {
     public:
       InterestOperator(Pvl &pPvl);
-      
+
       virtual ~InterestOperator();
-      
+
       void InitInterestOptions();
 
       void SetPatternValidPercent(const double percent);
diff --git a/isis/src/control/objs/InterestOperator/unitTest.cpp b/isis/src/control/objs/InterestOperator/unitTest.cpp
index 084b5e4de1bf0be5739436c6402073098de74716..0d6c39e2d4272bfa2cdec3b7f846dc364d96b5e0 100644
--- a/isis/src/control/objs/InterestOperator/unitTest.cpp
+++ b/isis/src/control/objs/InterestOperator/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include <cstdlib>
 #include "InterestOperator.h"
diff --git a/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.cpp b/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.cpp
index c23a4de8d7c9e2ece1c783976a5d3696cb2e8dd7..ffa872601c6690da626066e6d1938ca1ca9c4e16 100644
--- a/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.cpp
+++ b/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.cpp
@@ -1,25 +1,10 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2010/06/10 23:42:31 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "InterestOperatorFactory.h"
 #include "InterestOperator.h"
diff --git a/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.h b/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.h
index e97ace2f880a916511255beb4aad6361fc37a176..76b8d415e7bd9a67b385560a2e60e02227bb381c 100644
--- a/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.h
+++ b/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.h
@@ -1,27 +1,13 @@
 #ifndef InterestOperatorFactory_h
 #define InterestOperatorFactory_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2010/06/10 23:42:31 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 namespace Isis {
   class Pvl;
diff --git a/isis/src/control/objs/InterestOperatorFactory/unitTest.cpp b/isis/src/control/objs/InterestOperatorFactory/unitTest.cpp
index 51c0fad3bdf62c878b358900624d8287c999631a..6c1ac326c3d6013cba5d758a0137101c5b041355 100644
--- a/isis/src/control/objs/InterestOperatorFactory/unitTest.cpp
+++ b/isis/src/control/objs/InterestOperatorFactory/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include <cstdlib>
 #include "Preference.h"
diff --git a/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.cpp b/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.cpp
index 0a49bdfce535b598ca38c03afc16f302fde224c5..33d1bb715d66d04fa8140ac72f89555d42ac895e 100644
--- a/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.cpp
+++ b/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MaximumLikelihoodWFunctions.h"
 
 #include <QDataStream>
@@ -10,20 +18,20 @@
 #include "IString.h"
 
 namespace Isis {
-  /** 
+  /**
    * Sets up a maximumlikelihood estimation function with Huber model and default tweaking
    * constant
-   */  
+   */
   MaximumLikelihoodWFunctions::MaximumLikelihoodWFunctions() {
     this->setModel(Huber);
   } // choose Model and define the tweaking constant
 
 
 
-  /** 
+  /**
    * Sets up a maximumlikelihood estimation function with specified model and default tweaking
    * constant
-   * 
+   *
    * @param[in] enum Model modelSelection,  the model to be used
    *                                        (see documentation for enum Model)
    */
@@ -33,10 +41,10 @@ namespace Isis {
   }
 
 
-  
-  /** 
+
+  /**
    * Sets up a maximumlikelihood estimation function with specified model and tweaking constant
-   * 
+   *
    * @param[in] enum Model modelSelection, the model to be used
    *                                       (see documentation for enum Model)
    * @param[in] double tweaking constant, exact meaning varies by model, but generally the larger
@@ -45,7 +53,7 @@ namespace Isis {
    *                                      included in the solution.
    * @throws IsisProgrammerError if tweakingConstant <= 0.0
    */
-  MaximumLikelihoodWFunctions::MaximumLikelihoodWFunctions(Model modelSelection, 
+  MaximumLikelihoodWFunctions::MaximumLikelihoodWFunctions(Model modelSelection,
                                                            double tweakingConstant) {
     // choose Model and define the tweaking constant
     setModel(modelSelection, tweakingConstant);
@@ -53,7 +61,7 @@ namespace Isis {
 
   MaximumLikelihoodWFunctions::MaximumLikelihoodWFunctions(
       const MaximumLikelihoodWFunctions &other)
-      : m_model(other.m_model), 
+      : m_model(other.m_model),
         m_tweakingConstant(other.m_tweakingConstant) {
   }
 
@@ -69,7 +77,7 @@ namespace Isis {
     return *this;
   }
 
-  /** 
+  /**
    * Allows the maximum likelihood model to be changed together and the default tweaking constant
    * to be set
    *
@@ -84,7 +92,7 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    * Sets default tweaking constants based on the maximum likelihood estimation model being used.
    */
   void MaximumLikelihoodWFunctions::setTweakingConstantDefault() {
@@ -92,7 +100,7 @@ namespace Isis {
     switch (m_model) {
       case Huber:
         m_tweakingConstant = 1.345; // "95% asymptotic efficiecy on the standard normal distribution"
-                                    // is obtained with this constant, 
+                                    // is obtained with this constant,
                                     // see Zhang's "Parameter Estimation"
         break;
       case HuberModified:
@@ -106,7 +114,7 @@ namespace Isis {
                                     // see Zhang's "Parameter Estimation"
         break;
       case Chen:
-        m_tweakingConstant = 1;     // This is the constant used by Chen in his paper, 
+        m_tweakingConstant = 1;     // This is the constant used by Chen in his paper,
                                     // no specific reason why is stated
         break;
       default:
@@ -117,7 +125,7 @@ namespace Isis {
 
 
 
-/** 
+/**
  * Allows the maximum likelihood model to be changed together with the tweaking constant
  *
  * @param[in] enum Model modelSelection,  the model to be used
@@ -128,7 +136,7 @@ namespace Isis {
  *                                       measures are included in the solution.
  * @throws IsisProgrammerError if tweakingConstant <= 0.0
  */
-  void MaximumLikelihoodWFunctions::setModel(Model modelSelection, double tweakingConstant) { 
+  void MaximumLikelihoodWFunctions::setModel(Model modelSelection, double tweakingConstant) {
     // choose Model and define the tweaking constant
     m_model = modelSelection;
     setTweakingConstant(tweakingConstant);
@@ -136,16 +144,16 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    * Allows the tweaking constant to be changed without changing the maximum likelihood function
    *
    * @param[in] tweakingConstant,  exact meaning varies by model, but generally the larger
    * the value the more influence larger resiudals have on the solution. As well as possiblly the
    * more measures are included in the solution.
-   * 
+   *
    * @throws IsisProgrammerError if tweakingConstant <= 0.0
    */
-  void MaximumLikelihoodWFunctions::setTweakingConstant(double tweakingConstant) { 
+  void MaximumLikelihoodWFunctions::setTweakingConstant(double tweakingConstant) {
     // leave model type unaltered and change tweaking constant
     if (tweakingConstant <= 0.0) {
       IString msg = "Maximum likelihood estimation tweaking constants must be > 0.0";
@@ -156,7 +164,7 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    *  Returns the current tweaking constant
    */
   double MaximumLikelihoodWFunctions::tweakingConstant() const {
@@ -165,45 +173,45 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    * This provides the scalar for the weight (not the scaler for the square
    * root of the weight, which is generally more useful)
    *
-   * @param[in] double residualZScore, this the residual of a particulare measure in a particular 
+   * @param[in] double residualZScore, this the residual of a particulare measure in a particular
    *                                   iteration divided by the standard deviation (sigma) of that
    *                                   measure
-   * @return double the scaler adjustment to the weight for the measure 
+   * @return double the scaler adjustment to the weight for the measure
    *                nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma
    */
-  double MaximumLikelihoodWFunctions::weightScaler(double residualZScore) {  
+  double MaximumLikelihoodWFunctions::weightScaler(double residualZScore) {
     // this is likely the least usefull of the scaler functions but it is provided for completness.
     // This directly provides the scaler for the weight (instead of the radical weight), thus it
-    // provides sqrtWeightScaler^2 
+    // provides sqrtWeightScaler^2
     switch(m_model) {
     case Huber:
-      return this->huber(residualZScore);  
+      return this->huber(residualZScore);
     case HuberModified:
       return this->huberModified(residualZScore);
     case Welsch:
-      return this->welsch(residualZScore);  
+      return this->welsch(residualZScore);
     case Chen:
       return this->chen(residualZScore);
     default:
-      return 1.0;  // default to prevent nonsense from being returned, 
+      return 1.0;  // default to prevent nonsense from being returned,
                    // but the program should never reach this line
     }
   }
 
 
 
-  /** 
-   * This provides the scaler to the sqrt of the weight, which is very useful for building normal 
+  /**
+   * This provides the scaler to the sqrt of the weight, which is very useful for building normal
    * equations.
    *
-   * @param[in] double residualZScore, this the residual of a particulare measure in a particular 
+   * @param[in] double residualZScore, this the residual of a particulare measure in a particular
    *                                   iteration divided by the standard deviation (sigma) of that
    *                                   measure
-   * @return double the scaler adjustment to the sqrt of the weight for the measure 
+   * @return double the scaler adjustment to the sqrt of the weight for the measure
    *         nominal sqrt(weight) = 1 /sigma and sqrt(weight') = scaler/sigma
    */
   double MaximumLikelihoodWFunctions::sqrtWeightScaler(double residualZScore) {
@@ -219,14 +227,14 @@ namespace Isis {
 
 
 
-  /** 
-   * Huber maximum likelihood estimation function evaluation.  For details, see documentation of the 
-   * enum, MaximumLikelihoodWFunctions::Model 
+  /**
+   * Huber maximum likelihood estimation function evaluation.  For details, see documentation of the
+   * enum, MaximumLikelihoodWFunctions::Model
    *
-   * @param[in] double residualZScore, this the residual of a particulare measure in a particular 
+   * @param[in] double residualZScore, this the residual of a particulare measure in a particular
    *                                   iteration divided by the standard deviation (sigma) of that
    *                                   measure
-   * @return double the scaler adjustment to the weight for the measure 
+   * @return double the scaler adjustment to the weight for the measure
    *         nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma
    */
   double MaximumLikelihoodWFunctions::huber(double residualZScore) {
@@ -241,14 +249,14 @@ namespace Isis {
 
 
 
-  /** 
-   * Modified Huber maximum likelihood estimation function evaluation.  For 
-   * details see documentation of enum Model 
+  /**
+   * Modified Huber maximum likelihood estimation function evaluation.  For
+   * details see documentation of enum Model
    *
-   * @param[in] double residualZScore, this the residual of a particulare measure in a particular 
+   * @param[in] double residualZScore, this the residual of a particulare measure in a particular
    *                                   iteration divided by the standard deviation (sigma) of that
    *                                   measure
-   * @return double the scaler adjustment to the weight for the measure 
+   * @return double the scaler adjustment to the weight for the measure
    *         nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma
    */
   double MaximumLikelihoodWFunctions::huberModified(double residualZScore) {
@@ -263,14 +271,14 @@ namespace Isis {
 
 
 
-  /** 
-   * Modified Huber maximum likelihood estimation function evaluation.  For 
-   * details see documentation of enum Model 
+  /**
+   * Modified Huber maximum likelihood estimation function evaluation.  For
+   * details see documentation of enum Model
    *
-   * @param[in] double residualZScore, this the residual of a particulare measure in a particular 
+   * @param[in] double residualZScore, this the residual of a particulare measure in a particular
    *                                   iteration divided by the standard deviation (sigma) of that
    *                                   measure
-   * @return double the scaler adjustment to the weight for the measure 
+   * @return double the scaler adjustment to the weight for the measure
    *         nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma
    */
   double MaximumLikelihoodWFunctions::welsch(double residualZScore) {
@@ -281,23 +289,23 @@ namespace Isis {
 
 
 
-  /** 
-   * Modified Huber maximum likelihood estimation function evaluation. 
+  /**
+   * Modified Huber maximum likelihood estimation function evaluation.
    * For details, see documentation of enum Model.
    *
-   * @param[in] double residualZScore, this the residual of a particulare measure in a particular 
+   * @param[in] double residualZScore, this the residual of a particulare measure in a particular
    *                                   iteration divided by the standard deviation (sigma) of that
-   *                                   measure 
-   * @return double the scaler adjustment to the weight for the measure 
+   *                                   measure
+   * @return double the scaler adjustment to the weight for the measure
    *         nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma
    */
   double MaximumLikelihoodWFunctions::chen(double residualZScore) {
     // chen weight function
     if ( fabs(residualZScore) <= m_tweakingConstant) {
-      double weightFactor = m_tweakingConstant * m_tweakingConstant 
+      double weightFactor = m_tweakingConstant * m_tweakingConstant
                             - residualZScore * residualZScore;
       return 6 * weightFactor * weightFactor;  // use of weight factor variable reduces number of
-                                               // operations from 7 to 4 
+                                               // operations from 7 to 4
     }
     else {
       return 0.0;
@@ -306,15 +314,15 @@ namespace Isis {
 
 
 
-  /** 
-   * Suggest a quantile of the probility distribution of the residuals to use as the tweaking 
+  /**
+   * Suggest a quantile of the probility distribution of the residuals to use as the tweaking
    * constants based on the maximum likelihood estimation model being used.
    *
-   * @return double quantile [0,1] the value pretaining to this quantile (in the probility 
+   * @return double quantile [0,1] the value pretaining to this quantile (in the probility
    *         distribution of the residuals) should be used as the tweaking constant.
    */
-  double MaximumLikelihoodWFunctions::tweakingConstantQuantile() {  
-    // returns which quantile of the sqaured residuals is recommended to use as the tweaking 
+  double MaximumLikelihoodWFunctions::tweakingConstantQuantile() {
+    // returns which quantile of the sqaured residuals is recommended to use as the tweaking
     // constants, this varies as a function of the model being employed desired quantiles for
     // various models,  these parameters are estimated based on inspection of the fucntions and
     // should be tested and revised with experience
@@ -325,7 +333,7 @@ namespace Isis {
                    // have the same effect on the solution regardless of magnitude
     case HuberModified:
       return 0.4; // In this model after residualZScore >= m_tweakingConstant*Isis::HALFPI the residuals have the same
-                  // influence on the solution, 
+                  // influence on the solution,
     case Welsch:
       return 0.7; // at about double m_tweakingConstant the residuals have very little influence
     case Chen:
@@ -337,12 +345,12 @@ namespace Isis {
 
 
 
-  /** 
-   * Static method to return a string represtentation for a given MaximumLikelihoodWFunctions::Model 
-   * enum. 
-   *  
+  /**
+   * Static method to return a string represtentation for a given MaximumLikelihoodWFunctions::Model
+   * enum.
+   *
    * @param model Enumerated value for a MaximumLikelihoodWFunctions model.
-   * @return QString label for the enumeration.  
+   * @return QString label for the enumeration.
    */
   QString MaximumLikelihoodWFunctions::modelToString(MaximumLikelihoodWFunctions::Model model) {
     if (model == MaximumLikelihoodWFunctions::Huber)              return "Huber";
@@ -380,11 +388,11 @@ namespace Isis {
 
 
 
-  /** 
-   * Method to return a string represtentation of the weighted residual cutoff (if it exists) for 
-   * the MaximumLikelihoodWFunctions::Model.  If no cutoff exists, the string "N/A" is returned. 
-   *  
-   * @return QString label for the weighted residual cut off of the maximum likelihood estimation 
+  /**
+   * Method to return a string represtentation of the weighted residual cutoff (if it exists) for
+   * the MaximumLikelihoodWFunctions::Model.  If no cutoff exists, the string "N/A" is returned.
+   *
+   * @return QString label for the weighted residual cut off of the maximum likelihood estimation
    *         model.
    * @throw  "Estimation model has not been set."
    */
@@ -397,9 +405,9 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    * Accessor method to return the MaximumLikelihoodWFunctions::Model enumeration.
-   *  
+   *
    * @return enum for the maximum likelihood estimation model.
    */
   MaximumLikelihoodWFunctions::Model MaximumLikelihoodWFunctions::model() const {
diff --git a/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.h b/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.h
index f31ee3a0eb2885dc8d473780ac2f453026519a76..2c0ecdabe2c86a35ee5675e5ad3a60f6c7f45e92 100644
--- a/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.h
+++ b/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.h
@@ -1,42 +1,27 @@
 #ifndef MaximumLikelihoodWFunctions_h
 #define MaximumLikelihoodWFunctions_h
 
-/**
- * @file
- * $Revision: 1.14 $
- * $Date: 2009/09/08 17:38:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 
 namespace Isis {
   /**
-   * @brief Class provides maximum likelihood estimation functions for robust parameter estimation, 
+   * @brief Class provides maximum likelihood estimation functions for robust parameter estimation,
    *        e.g. in bundle adjustment.
    *
-   * A maximum likelihood estimation W function provides a scheme for 're-weighting' observations so 
-   * that measures with large residuals have reduced or negligible effect on the solution.  There 
-   * are many such functions available, a few have been programmed into this class.  See enum Model 
-   * documentation for specifics of the estimation models. 
-   *  
-   * References:  Zhangs,  "Parameter Estimation: A Tutorial with Application to Conic Fitting" 
+   * A maximum likelihood estimation W function provides a scheme for 're-weighting' observations so
+   * that measures with large residuals have reduced or negligible effect on the solution.  There
+   * are many such functions available, a few have been programmed into this class.  See enum Model
+   * documentation for specifics of the estimation models.
+   *
+   * References:  Zhangs,  "Parameter Estimation: A Tutorial with Application to Conic Fitting"
    *              Koch, "Parameter Estimation and Hypothesis Testing in Linear Systems"
    *                    2nd edition, chapter 3.8
    *              Manual of Photogrammetry, 5th edition, chapter 2.2 (particularly 2.2.6)
@@ -58,12 +43,12 @@ namespace Isis {
    *                           methods.
    *   @history 2014-09-19 Jeannie Backer - Removed bugs. Added documentation. Cleaned
    *                           duplicate code.
-   *   @history 2018-06-29 Christopher Combs - Added extra HuberModified case to stringToModel(). 
+   *   @history 2018-06-29 Christopher Combs - Added extra HuberModified case to stringToModel().
    *                           Fixes #5446.
    */
   class MaximumLikelihoodWFunctions {
   public:
-    /** 
+    /**
      * The supported maximum likelihood estimation models.
      */
     // Each model has an accompannying private method that converts from a
@@ -77,15 +62,15 @@ namespace Isis {
        *   No measures are totally disregarded.
        *    http://research.microsoft.com/en-us/um/people/zhang/Papers/ZhangIVC-97-01.pdf
        */
-      Huber,     
-     
+      Huber,
+
       /** A modification to Huber's method propsed by William J.J. Rey in Introduction to Robust
        *  and Quasi-Robust Statistical Methods. Springer, Berlin, Heidelberg, 1983.  It has similiar
        *  properties to the Huber, but with a continuous second derivative.  This comes at the cost
        *  of being somewhat more computationally expernsive.  No measures are totally disregarded.
        *    http://research.microsoft.com/en-us/um/people/zhang/Papers/ZhangIVC-97-01.pdf
        */
-      HuberModified,  
+      HuberModified,
 
       /** The Welsch method aggresively discounts measures with large resiudals.  Residuals two
        *  times greater than the tweaking constant are all but ignored.  This method can be risky to
@@ -96,7 +81,7 @@ namespace Isis {
        *  (such as Huber's).
        *    http://research.microsoft.com/en-us/um/people/zhang/Papers/ZhangIVC-97-01.pdf
        */
-      Welsch,         
+      Welsch,
 
       /** The Chen method was found in "Robust Regression with Projection Based M-estimators"  Chen,
        *  et. al.,  though Chen does not take credit as the author.  It was of interest because he
@@ -132,7 +117,7 @@ namespace Isis {
     // scalar functions provide access to various flavors of this scalar (as
     // a function of the residual divided by the residuals sigma)
 
-    double sqrtWeightScaler(double residualZScore); //it is often convient to use square roots of 
+    double sqrtWeightScaler(double residualZScore); //it is often convient to use square roots of
                                                     //weights when building normals, this function
                                                     // provides the scaler for the square root of
                                                     // the weight directly
@@ -158,7 +143,7 @@ namespace Isis {
    double m_tweakingConstant; /**< The tweaking constant for the maximum likelihood models.
                                    Default values are available for each model using the method
                                    setTweakingConstantDefault(). This value can also be manually
-                                   adjusted using the method setTweakingConstant(). If there is 
+                                   adjusted using the method setTweakingConstant(). If there is
                                    knowlege of the probility distrubtion of the residuals in an
                                    adjustment, tweakingConstantQuantile() will recommend which
                                    quantile to use as the tweaking constant.*/
diff --git a/isis/src/control/objs/MaximumLikelihoodWFunctions/unitTest.cpp b/isis/src/control/objs/MaximumLikelihoodWFunctions/unitTest.cpp
index 7e60a2bf2749a5069ca52d3badf0d6566a386902..e881c9289a3327535f6d09dd574bb48c5878d517 100644
--- a/isis/src/control/objs/MaximumLikelihoodWFunctions/unitTest.cpp
+++ b/isis/src/control/objs/MaximumLikelihoodWFunctions/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDataStream>
 #include <QDebug>
 
@@ -31,7 +39,7 @@ int main(int argc, char *argv[]) {
 
   qDebug() << "Default constructor sets model to Huber and corresponding default TC:";
   MaximumLikelihoodWFunctions wFunc;
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -43,12 +51,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setTweakingConstant(2.0);
   qDebug() << "TC constant re-set to 2.0:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -60,12 +68,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setTweakingConstantDefault();
   qDebug() << "TC constant re-set to default:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -77,12 +85,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setModel(MaximumLikelihoodWFunctions::Huber);
   qDebug() << "Model manually set with default TC:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -94,12 +102,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
-  
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
+
   wFunc.setModel(MaximumLikelihoodWFunctions::Huber, 2.0);
   qDebug() << "Model manually set with TC = 2.0:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -111,12 +119,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   MaximumLikelihoodWFunctions copyWFunc(wFunc);
   qDebug() << "Testing Copy constructor:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(copyWFunc.model());
   qDebug() << "TweakingConstant         = " << toString(copyWFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << copyWFunc.weightedResidualCutoff();
@@ -128,16 +136,16 @@ int main(int argc, char *argv[]) {
   temp = copyWFunc.sqrtWeightScaler(-2.0);
   qDebug() << "copyWFunc->sqrtWeightScaler(-2):   " << temp;
   temp = copyWFunc.sqrtWeightScaler(2.5);
-  qDebug() << "copyWFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
-  qDebug() << ""; 
+  qDebug() << "copyWFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
+  qDebug() << "";
 
 
 
   qDebug() << "Reassign object using operator= and passing HuberModified to constructor with "
               "default TC:";
   wFunc = MaximumLikelihoodWFunctions(MaximumLikelihoodWFunctions::stringToModel("HuberModified"));
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -149,12 +157,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setTweakingConstant(2.0);
   qDebug() << "TC constant re-set to 2.0:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -166,12 +174,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setTweakingConstantDefault();
   qDebug() << "TC constant re-set to default:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -183,12 +191,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setModel(MaximumLikelihoodWFunctions::stringToModel("Huber_Modified"));
   qDebug() << "Model manually set to Huber_Modified with default TC:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -200,12 +208,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
-  
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
+
   wFunc.setModel(MaximumLikelihoodWFunctions::HuberModified, 2.0);
   qDebug() << "Model manually set with TC = 2.0:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -217,15 +225,15 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
+  qDebug() << "";
 
 
 
   qDebug() << "Reassign object using operator= and passing Welsch with TC = 2.0:";
   wFunc = MaximumLikelihoodWFunctions(MaximumLikelihoodWFunctions::stringToModel("Welsch"), 2.0);
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -237,12 +245,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setTweakingConstantDefault();
   qDebug() << "TC constant set to default:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -254,12 +262,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setModel(MaximumLikelihoodWFunctions::Welsch);
   qDebug() << "Model manually set with default TC:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -271,12 +279,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
-  
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
+
   wFunc.setModel(MaximumLikelihoodWFunctions::Welsch, 2.0);
   qDebug() << "Model manually set with TC = 2.0:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -288,16 +296,16 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
+  qDebug() << "";
 
 
 
 
   qDebug() << "Reassign object using operator= and passing Chen with default TC:";
   wFunc = MaximumLikelihoodWFunctions(MaximumLikelihoodWFunctions::stringToModel("Chen"));
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -309,12 +317,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setTweakingConstant(2.0);
   qDebug() << "TC constant re-set to 2.0:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -326,12 +334,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setTweakingConstantDefault();
   qDebug() << "TC constant re-set to default:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -343,12 +351,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
 
   wFunc.setModel(MaximumLikelihoodWFunctions::Chen);
   qDebug() << "Model manually set with default TC:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -360,12 +368,12 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
-  
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
+
   wFunc.setModel(MaximumLikelihoodWFunctions::Chen, 2.0);
   qDebug() << "Model manually set with TC = 2.0:";
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -377,9 +385,9 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
+  qDebug() << "";
 
 
   qDebug() << "Testing serialization...";
@@ -390,7 +398,7 @@ int main(int argc, char *argv[]) {
   QDataStream inputData(byteArray);
   MaximumLikelihoodWFunctions newWFunc;
   inputData >> newWFunc;
-  qDebug() << "Model                    = " 
+  qDebug() << "Model                    = "
            << MaximumLikelihoodWFunctions::modelToString(wFunc.model());
   qDebug() << "TweakingConstant         = " << toString(wFunc.tweakingConstant());
   qDebug() << "WeightedResidualCutoff   = " << wFunc.weightedResidualCutoff();
@@ -402,8 +410,8 @@ int main(int argc, char *argv[]) {
   temp = wFunc.sqrtWeightScaler(-2.0);
   qDebug() << "wFunc->sqrtWeightScaler(-2):   " << temp;
   temp = wFunc.sqrtWeightScaler(2.5);
-  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp; 
-  qDebug() << ""; 
+  qDebug() << "wFunc->sqrtWeightScaler(2.5):  " << temp;
+  qDebug() << "";
   qDebug() << "Huber enum written to and read from QByteArray:";
   QByteArray enumByteArray;
   QDataStream outputEnumData(&enumByteArray, QIODevice::WriteOnly);
@@ -412,25 +420,25 @@ int main(int argc, char *argv[]) {
   MaximumLikelihoodWFunctions::Model model;
   inputEnumData >> model;
   qDebug() << "Model                    = " << MaximumLikelihoodWFunctions::modelToString(model);
-  qDebug() << ""; 
-  qDebug() << ""; 
+  qDebug() << "";
+  qDebug() << "";
 
   qDebug() << "Testing error throws...";
   try {
     wFunc.setTweakingConstant(-1.0);
-  } 
+  }
   catch (IException &e) {
     e.print();
   }
   try {
     MaximumLikelihoodWFunctions::modelToString((MaximumLikelihoodWFunctions::Model)4);
-  } 
+  }
   catch (IException &e) {
     e.print();
   }
   try {
     MaximumLikelihoodWFunctions::stringToModel("Nonsense");
-  } 
+  }
   catch (IException &e) {
     e.print();
   }
diff --git a/isis/src/database/objs/Database/Database.cpp b/isis/src/database/objs/Database/Database.cpp
index 7397f3f3fae51d4041c32c95db675aba7722fe3f..549b9ee8b84d744e5c46914ee0c4e3eadc6c8429 100644
--- a/isis/src/database/objs/Database/Database.cpp
+++ b/isis/src/database/objs/Database/Database.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2010/06/26 01:19:21 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <string>
 #include <vector>
 #include <iostream>
diff --git a/isis/src/database/objs/Database/Database.h b/isis/src/database/objs/Database/Database.h
index 25ce4bf3d992686b4ffde47112075b34bd67f894..123b8e2d12cb80085d21b80075e89b5ce40af1c5 100644
--- a/isis/src/database/objs/Database/Database.h
+++ b/isis/src/database/objs/Database/Database.h
@@ -1,27 +1,13 @@
 #ifndef Database_h
 #define Database_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/10/30 16:38:23 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
diff --git a/isis/src/database/objs/Database/unitTest.cpp b/isis/src/database/objs/Database/unitTest.cpp
index 25e3e9a021a0c4ba0ed2dd9e38965c7075ec3c84..adb10c46bc32ef62b424168ea0126f0a5f2a01b6 100644
--- a/isis/src/database/objs/Database/unitTest.cpp
+++ b/isis/src/database/objs/Database/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <string>
 #include <vector>
 #include "Database.h"
diff --git a/isis/src/database/objs/DatabaseFactory/DatabaseFactory.cpp b/isis/src/database/objs/DatabaseFactory/DatabaseFactory.cpp
index 8048ce141692b4366fafaadfddda9ff3d22ec8e4..f7d37d15787fa02eb82fb807c1c34c14ba94e052 100644
--- a/isis/src/database/objs/DatabaseFactory/DatabaseFactory.cpp
+++ b/isis/src/database/objs/DatabaseFactory/DatabaseFactory.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2009/11/27 23:09:58 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cstdlib>
 #include <string>
 #include <vector>
diff --git a/isis/src/database/objs/DatabaseFactory/DatabaseFactory.h b/isis/src/database/objs/DatabaseFactory/DatabaseFactory.h
index 565bac51633d936cf6a672528090b29a294c1ed3..dffc1abd62a41f67d0b2f0ee09528b5f3db39be9 100644
--- a/isis/src/database/objs/DatabaseFactory/DatabaseFactory.h
+++ b/isis/src/database/objs/DatabaseFactory/DatabaseFactory.h
@@ -1,27 +1,13 @@
 #ifndef DatabaseFactory_h
 #define DatabaseFactory_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2009/11/27 23:09:58 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -363,6 +349,3 @@ namespace Isis {
   };
 }
 #endif
-
-
-
diff --git a/isis/src/database/objs/DatabaseFactory/unitTest.cpp b/isis/src/database/objs/DatabaseFactory/unitTest.cpp
index 2ad32d80eb4c1190050cdf1c1ea89aa0ba8b2bb3..512476be3625e63cd1425571b7756d9218b62a46 100644
--- a/isis/src/database/objs/DatabaseFactory/unitTest.cpp
+++ b/isis/src/database/objs/DatabaseFactory/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "DbProfile.h"
 #include "Database.h"
 #include "DatabaseFactory.h"
diff --git a/isis/src/database/objs/DbAccess/DbAccess.cpp b/isis/src/database/objs/DbAccess/DbAccess.cpp
index 0c1b3697fe5a28b039616b90759ed6c1eaee5a87..dfa24d58abf89cccfe3d5d8669a9b008623ab89b 100644
--- a/isis/src/database/objs/DbAccess/DbAccess.cpp
+++ b/isis/src/database/objs/DbAccess/DbAccess.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2007/06/06 00:35:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
diff --git a/isis/src/database/objs/DbAccess/DbAccess.h b/isis/src/database/objs/DbAccess/DbAccess.h
index 94ef6ac96656688c9f31088167b730cbeaad5901..d27a819421784f37184906c75f8510dbbb74fea9 100644
--- a/isis/src/database/objs/DbAccess/DbAccess.h
+++ b/isis/src/database/objs/DbAccess/DbAccess.h
@@ -1,27 +1,13 @@
 #ifndef DbAccess_h
 #define DbAccess_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2007/06/06 00:35:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -186,5 +172,3 @@ namespace Isis {
 
 }
 #endif
-
-
diff --git a/isis/src/database/objs/DbAccess/unitTest.cpp b/isis/src/database/objs/DbAccess/unitTest.cpp
index e7fae975d7ba2ccac2ab313c2d69441c8bfac572..0aa2fd6d5465c8be5a10c55d519ea37edf9d5864 100644
--- a/isis/src/database/objs/DbAccess/unitTest.cpp
+++ b/isis/src/database/objs/DbAccess/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "DbAccess.h"
 #include "Preference.h"
 
diff --git a/isis/src/database/objs/DbProfile/DbProfile.cpp b/isis/src/database/objs/DbProfile/DbProfile.cpp
index b1702f0e60bcdabb9e1c5e6e0285c917426794b6..49870faec992b0046f395d164b3f6322d29aa03b 100644
--- a/isis/src/database/objs/DbProfile/DbProfile.cpp
+++ b/isis/src/database/objs/DbProfile/DbProfile.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/09/06 06:47:48 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
diff --git a/isis/src/database/objs/DbProfile/DbProfile.h b/isis/src/database/objs/DbProfile/DbProfile.h
index 2fa5807f74b68e30b3219761862578c5ef0bcfcc..4e07cc9507a59a2660a77f4c6e9b549fe220ab08 100644
--- a/isis/src/database/objs/DbProfile/DbProfile.h
+++ b/isis/src/database/objs/DbProfile/DbProfile.h
@@ -1,27 +1,13 @@
 #ifndef DbProfile_h
 #define DbProfile_h
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2008/09/06 06:47:48 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -182,5 +168,3 @@ namespace Isis {
 
 
 #endif
-
-
diff --git a/isis/src/database/objs/DbProfile/unitTest.cpp b/isis/src/database/objs/DbProfile/unitTest.cpp
index 9acb74ab66f8ec0eca55b2aaa2693723839d1619..6be0be9df5ad7cef2da0e7d9a625490d7bdbfdee 100644
--- a/isis/src/database/objs/DbProfile/unitTest.cpp
+++ b/isis/src/database/objs/DbProfile/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "DbProfile.h"
 #include "Preference.h"
 
diff --git a/isis/src/database/objs/SqlQuery/SqlQuery.cpp b/isis/src/database/objs/SqlQuery/SqlQuery.cpp
index 2e8cbdf1488f480bbe93df4eb3e9aadcbeda499a..9e312cec5b66f536e000a52a715d63fdf519add7 100644
--- a/isis/src/database/objs/SqlQuery/SqlQuery.cpp
+++ b/isis/src/database/objs/SqlQuery/SqlQuery.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.6 $
- * $Date: 2008/10/30 16:40:50 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <string>
 #include <vector>
 #include <iostream>
diff --git a/isis/src/database/objs/SqlQuery/SqlQuery.h b/isis/src/database/objs/SqlQuery/SqlQuery.h
index 75a313be252cde7c6087b23a8a3279bae390b9bc..af4c59148798f2fb9be1cce2ee99afb0e574c141 100644
--- a/isis/src/database/objs/SqlQuery/SqlQuery.h
+++ b/isis/src/database/objs/SqlQuery/SqlQuery.h
@@ -1,27 +1,13 @@
 #ifndef SqlQuery_h
 #define SqlQuery_h
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2008/10/30 16:40:50 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
diff --git a/isis/src/database/objs/SqlQuery/unitTest.cpp b/isis/src/database/objs/SqlQuery/unitTest.cpp
index e47f9de9048abaf5ff9c608a1527c3c2e94f0acd..044b9e0189d6c96206fcb957d378efba63e70221 100644
--- a/isis/src/database/objs/SqlQuery/unitTest.cpp
+++ b/isis/src/database/objs/SqlQuery/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "SqlQuery.h"
 #include "SqlRecord.h"
 #include "FileName.h"
diff --git a/isis/src/database/objs/SqlRecord/SqlRecord.cpp b/isis/src/database/objs/SqlRecord/SqlRecord.cpp
index 9a9501cd2cf57f023970608137d166b32caa479c..72a774357e432f53576840278280ee72d4450264 100644
--- a/isis/src/database/objs/SqlRecord/SqlRecord.cpp
+++ b/isis/src/database/objs/SqlRecord/SqlRecord.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2007/06/06 00:46:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cctype>
 #include <string>
 #include <vector>
diff --git a/isis/src/database/objs/SqlRecord/SqlRecord.h b/isis/src/database/objs/SqlRecord/SqlRecord.h
index 979177afe0fa82e6eedfb55ac0acac7546ddb746..bf16943ed9211e24a88bb0bf28fb42e8df5ba02b 100644
--- a/isis/src/database/objs/SqlRecord/SqlRecord.h
+++ b/isis/src/database/objs/SqlRecord/SqlRecord.h
@@ -1,27 +1,13 @@
 #ifndef SqlRecord_h
 #define SqlRecord_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2007/06/06 00:46:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
diff --git a/isis/src/database/objs/SqlRecord/unitTest.cpp b/isis/src/database/objs/SqlRecord/unitTest.cpp
index 13fd088a5daca2f88e464846b476e3801de0b94c..3f14aaa7d7f3145ba6c3839c7852d1e322f5aea4 100644
--- a/isis/src/database/objs/SqlRecord/unitTest.cpp
+++ b/isis/src/database/objs/SqlRecord/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Database.h"
 
 #include <QFile>
diff --git a/isis/src/dawn/apps/dawnfc2isis/main.cpp b/isis/src/dawn/apps/dawnfc2isis/main.cpp
index 82215efc4fdeba03f5ae89f95190a1bcc532f951..691a36795ba572650945937524b76462b456a1cf 100644
--- a/isis/src/dawn/apps/dawnfc2isis/main.cpp
+++ b/isis/src/dawn/apps/dawnfc2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
diff --git a/isis/src/dawn/apps/dawnvir2isis/main.cpp b/isis/src/dawn/apps/dawnvir2isis/main.cpp
index 3ca99386b17aee64bcf031a477be1c9803766429..74487cd4f39c500a8abaed22c7d4df83157becb9 100644
--- a/isis/src/dawn/apps/dawnvir2isis/main.cpp
+++ b/isis/src/dawn/apps/dawnvir2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
diff --git a/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.cpp b/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.cpp
index cd6b0a460ec29393fa3a2863c94bdbde357fab49..a1a7f024047abe6b7805bcf6dc752edf61ad8f57 100644
--- a/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.cpp
+++ b/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "DawnFcCamera.h"
 #include "DawnFcDistortionMap.h"
diff --git a/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h b/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h
index 11000e9970f8658b3691f51f62bd6037f12023d2..c9f7424fed1d7b63c65b334ddf67f0a6cb566f25 100644
--- a/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h
+++ b/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h
@@ -1,30 +1,19 @@
 #ifndef DawnFcCamera_h
 #define DawnFcCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
 namespace Isis {
   /**
-   * This is the camera model for the Dawn Framing Camera 
+   * This is the camera model for the Dawn Framing Camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Dawn
@@ -43,15 +32,15 @@ namespace Isis {
    *                           Updated documentation. Replaced Dawn namespace
    *                           wrap with Isis namespace. Added Isis Disclaimer to
    *                           files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-25 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Modified check for determing 
-   *                           the instrument name to also accept filter instrument kernal codes. 
+   *   @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Modified check for determing
+   *                           the instrument name to also accept filter instrument kernal codes.
    *                           References #2335.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -65,23 +54,23 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-203000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/dawn/objs/DawnFcCamera/DawnFcDistortionMap.h b/isis/src/dawn/objs/DawnFcCamera/DawnFcDistortionMap.h
index 2e392c1b2f75ef00beaf7b62749d6d63670123df..acf0ec107e28b986da0f9238c8a230945ffad9d4 100644
--- a/isis/src/dawn/objs/DawnFcCamera/DawnFcDistortionMap.h
+++ b/isis/src/dawn/objs/DawnFcCamera/DawnFcDistortionMap.h
@@ -1,6 +1,14 @@
 #ifndef DawnFcDistortionMap_h
 #define DawnFcDistortionMap_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CameraDistortionMap.h"
 #include "Camera.h"
 
diff --git a/isis/src/dawn/objs/DawnFcCamera/unitTest.cpp b/isis/src/dawn/objs/DawnFcCamera/unitTest.cpp
index e115e0758d729fa0127527aa871a0ecb46163ad6..192b3cb705f56a11cdcf527018aeb55c0a309412 100644
--- a/isis/src/dawn/objs/DawnFcCamera/unitTest.cpp
+++ b/isis/src/dawn/objs/DawnFcCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -58,7 +47,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     // TODO - test an FC1 image when data can be found.
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -66,7 +55,7 @@ int main(void) {
     cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
     cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
@@ -111,7 +100,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Test exception
     cout << endl << "Testing exceptions ..." << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
@@ -142,4 +131,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.cpp b/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.cpp
index 6e17decd05ccb429e618a91321837a246c19e90b..a0b4f9ae7e31e83aa378c07991d3ee9b5f62c713 100644
--- a/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.cpp
+++ b/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.cpp
@@ -1,4 +1,12 @@
- #include "DawnVirCamera.h"
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
+#include "DawnVirCamera.h"
 
 #include <cctype>
 #include <iostream>
@@ -30,12 +38,12 @@ namespace Isis {
     // constructors
   /**
    * Creates a camera for a Dawn VIR cube
-   * 
+   *
    * @param cube The cube to make a camera for
-   * 
+   *
    */
   DawnVirCamera::DawnVirCamera(Cube &cube) : LineScanCamera(cube) {
-    
+
     m_instrumentNameLong = "Visual and Infrared Spectrometer";
     m_instrumentNameShort = "VIR";
     m_spacecraftNameLong = "Dawn";
@@ -151,33 +159,33 @@ namespace Isis {
   DawnVirCamera::~DawnVirCamera() {
   }
 
-  /** 
+  /**
    *  Returns CK frame identifier
-   * 
+   *
    * @return @b int The CK frame identifier.
    */
-  int DawnVirCamera::CkFrameId() const {  
-    return (-203000); 
+  int DawnVirCamera::CkFrameId() const {
+    return (-203000);
   }
 
 
-  /** 
+  /**
    *  Returns CK reference frame identifier
-   * 
+   *
    * @return @b int The CK reference frame identifier.
    */
-  int DawnVirCamera::CkReferenceId() const { 
-    return (1); 
+  int DawnVirCamera::CkReferenceId() const {
+    return (1);
   }
 
 
-  /** 
+  /**
    *  Return PK reference frame identifier
-   * 
+   *
    * @return @b int The PK reference frame identifier
    */
-  int DawnVirCamera::SpkReferenceId() const { 
-    return (1); 
+  int DawnVirCamera::SpkReferenceId() const {
+    return (1);
   }
 
 
@@ -203,9 +211,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return the pixel summing rate
-   * 
+   *
    * @return @b int The pixel summing rate.
    */
   int DawnVirCamera::pixelSumming() const {
@@ -213,9 +221,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return the exposure time
-   * 
+   *
    * @return @b double The exposure time for a pixel.
    */
   double DawnVirCamera::exposureTime() const {
@@ -223,9 +231,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return the line scan rate
-   * 
+   *
    * @return @b double The time between lines in the cube.
    */
   double DawnVirCamera::scanLineTime() const {
@@ -233,9 +241,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return the start time for a given line exposure time
-   * 
+   *
    * @return @b double The et time at the start of the line's exposure.
    */
   double DawnVirCamera::lineStartTime(const double midExpTime) const {
@@ -243,9 +251,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return the end time for a given line exposure time
-   * 
+   *
    * @return @b double The et time at the end of the line's exposure.
    */
   double DawnVirCamera::lineEndTime(const double midExpTime) const {
@@ -253,9 +261,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return start time for the entire cube.
-   * 
+   *
    * @return @b double The et time at the start of the cube.
    */
   double DawnVirCamera::startTime() const {
@@ -263,9 +271,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return end time for the entire cube.
-   * 
+   *
    * @return @b double The et time at the end of the cube.
    */
   double DawnVirCamera::endTime() const {
@@ -273,9 +281,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Returns number of housekeeping records found in the cube Table
-   * 
+   *
    * @return @b int The number of housekeeping records.
    */
   int DawnVirCamera::hkLineCount() const {
@@ -291,7 +299,7 @@ namespace Isis {
    * MirrorSin, and MirrorCos.  These fields contain the scan line time in
    * SCLK, status of shutter - open, closed (dark), sine and cosine of the
    * scan mirror, respectively.
-   * 
+   *
    * @param filename The filename of the cube with the house keeping table.
    * @param linerate The linerate for the cube.
    *
@@ -395,9 +403,9 @@ namespace Isis {
    * From the VIR housekeeping data, compute the pointing table for each line
    *  in the image.  This table is for instrumentRotation(Table &) to establish
    *  line/sample pointing information.
-   *  
+   *
    * @internal
-   *   @history 2011-07-22 Kris Becker 
+   *   @history 2011-07-22 Kris Becker
    */
   Table DawnVirCamera::getPointingTable(const QString &virChannel,
                                         const int zeroFrame)  {
@@ -519,7 +527,7 @@ namespace Isis {
    *  acceleration vectors are then set to 0.
    *
    * @internal
-   *   @history 2011-07-22 Kris Becker 
+   *   @history 2011-07-22 Kris Becker
    */
 
   DawnVirCamera::SMatrix DawnVirCamera::getStateRotation(const QString &frame1,
@@ -562,12 +570,12 @@ namespace Isis {
    *  the labels.  If a kernel with the file pattern "dawn_vir_?????????_?.bc"
    *  is present as a CK kernel, then that kernel contains mirror scan angles
    *  for each line.
-   *  
+   *
    *  If the kernel does not exist, this camera model will provide these angles
    *  from the VIR housekeeping data.
    *
    * @internal
-   *   @history 2011-07-22 Kris Becker 
+   *   @history 2011-07-22 Kris Becker
    */
   bool DawnVirCamera::hasArticulationKernel(Pvl &label) const {
     Kernels kerns(label);
@@ -582,7 +590,7 @@ namespace Isis {
 
 }
 
-/** 
+/**
  *  Instantiate a new DawnVirCamera model for the given label content
  */
 extern "C" Isis::Camera *DawnVirCameraPlugin(Isis::Cube &cube) {
diff --git a/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.h b/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.h
index ee0044e52f78349b0e3085976fc7450ecf069d07..27a301bf8fa82c6680bf5487c9b6b58ddf33f694 100644
--- a/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.h
+++ b/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.h
@@ -1,6 +1,14 @@
 #ifndef DawnVirCamera_h
 #define DawnVirCamera_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "LineScanCamera.h"
 
 #include <QString>
@@ -10,40 +18,40 @@
 #include "VariableLineScanCameraDetectorMap.h"
 
 namespace Isis {
-  /** 
-   * @brief Camera model for both Danw VIR VIS and IR instruments 
-   *  
-   * This class provides the camera model for the Dawn VIR VIS and 
+  /**
+   * @brief Camera model for both Danw VIR VIS and IR instruments
+   *
+   * This class provides the camera model for the Dawn VIR VIS and
    * IR instrumetns.  These instruments are on the Dawn spacecraft
-   * which will orbit the astroids Vesta (2011) and Ceres (2013). 
-   *  
-   * The ISIS cubes must contain a table called VIRHouseKeeping 
-   * that contains critical information.  Stored here is a row for 
-   * each line in the cube which contains the time (scan lines are 
-   * not strictly contiguous), electrical scan angles and shutter 
-   * state (closed == dark current).  The VIR instrument team will 
-   * provide a dynamic articulation kernel that has the physical 
-   * scan angle of the mirror but the contents of the tabel can be 
-   * used to compute it should it not exist (determined by the 
-   * file name pattern of the CK kernels). 
-   *  
-   * Without the articulation kernel, this camera model will 
-   * create a CK SpiceRotation table from the contents of the 
-   * houskeeping table.  This table is create only when spiceinit 
-   * is run for the first time on the image. 
-   *  
-   * Note that it works for calibrated (1B) and uncalibrated (1A). 
-   * One major issue is the dark current is typically collected at 
-   * the start and end of an observation.  The dark current 
-   * appears to always slew to a specific position, crossing the 
-   * observation scans.  This is the apparent cause of loss of 
-   * mapping lat/lons to line/samp.  To fix this, a Cubic spline 
-   * is fit to all scan angles and  all closed shutter scan line 
-   * mirror angles are replaced by the (typcially extrapolated) 
-   * values of the spline. 
-   *  
-   * @ingroup SpiceInstrumentsAndCameras 
-   * @ingroup Dawn 
+   * which will orbit the astroids Vesta (2011) and Ceres (2013).
+   *
+   * The ISIS cubes must contain a table called VIRHouseKeeping
+   * that contains critical information.  Stored here is a row for
+   * each line in the cube which contains the time (scan lines are
+   * not strictly contiguous), electrical scan angles and shutter
+   * state (closed == dark current).  The VIR instrument team will
+   * provide a dynamic articulation kernel that has the physical
+   * scan angle of the mirror but the contents of the tabel can be
+   * used to compute it should it not exist (determined by the
+   * file name pattern of the CK kernels).
+   *
+   * Without the articulation kernel, this camera model will
+   * create a CK SpiceRotation table from the contents of the
+   * houskeeping table.  This table is create only when spiceinit
+   * is run for the first time on the image.
+   *
+   * Note that it works for calibrated (1B) and uncalibrated (1A).
+   * One major issue is the dark current is typically collected at
+   * the start and end of an observation.  The dark current
+   * appears to always slew to a specific position, crossing the
+   * observation scans.  This is the apparent cause of loss of
+   * mapping lat/lons to line/samp.  To fix this, a Cubic spline
+   * is fit to all scan angles and  all closed shutter scan line
+   * mirror angles are replaced by the (typcially extrapolated)
+   * values of the spline.
+   *
+   * @ingroup SpiceInstrumentsAndCameras
+   * @ingroup Dawn
    *
    * @author 2011-03-10 Kris Becker
    *
@@ -52,12 +60,12 @@ namespace Isis {
    *   @history 2011-08-23 Kris Becker - Correct length of scan
    *            line to be the EXTERNAL_REPETITION_TIME of the
    *            FRAME_PARAMETER[2] value.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *            coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    *   @histroy 2016-10-27 Jesse Mapel - Modified to store exposure time instead of line rate in
@@ -96,16 +104,16 @@ namespace Isis {
       double startTime() const;
       double endTime() const;
 
-      Table getPointingTable(const QString &channelId, 
+      Table getPointingTable(const QString &channelId,
                              const int zeroFrame);
-      SMatrix getStateRotation(const QString &frame1, 
-                               const QString &frame2, 
+      SMatrix getStateRotation(const QString &frame1,
+                               const QString &frame2,
                                const double &et) const;
 
       bool hasArticulationKernel(Pvl &label) const;
 
-      /** 
-       *  
+      /**
+       *
        * @author ????-??-?? Unknown
        * @internal
        *   @history ????-??-?? Unknown - Original version.
diff --git a/isis/src/dawn/objs/DawnVirCamera/unitTest.cpp b/isis/src/dawn/objs/DawnVirCamera/unitTest.cpp
index 3bde08b187d9e7f9ced643a9a535b8878d255fd3..689c13256cb01edccaa0ee3035ca57dd9cfc8429 100644
--- a/isis/src/dawn/objs/DawnVirCamera/unitTest.cpp
+++ b/isis/src/dawn/objs/DawnVirCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 #include <algorithm>
@@ -44,7 +33,7 @@ void TestLineSamp(Camera *cam, double samp, double line);
  * @internal
  *   @history 2016-10-28 Kristin Berry - Updated known latitude, longitude, image start time,
  *                           and image stop time. References #4476.
- */  
+ */
 int main(void) {
   Preference::Preferences(true);
 
@@ -69,14 +58,14 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
     cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
     cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     //const PvlGroup &inst = p.findGroup("Instrument", Pvl::Traverse);
     std::pair< double, double > imgTimes = cam->StartEndEphemerisTimes();
     cout << "Start Time: " << imgTimes.first << "\n";
@@ -142,4 +131,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/dev/apps/camcoeffs/main.cpp b/isis/src/dev/apps/camcoeffs/main.cpp
index 989ab9d8e1b3939fa5b72d1b135482414522cc77..5354d67ea5c5eb3808c684bb2a096f110ef11feb 100644
--- a/isis/src/dev/apps/camcoeffs/main.cpp
+++ b/isis/src/dev/apps/camcoeffs/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <string>
diff --git a/isis/src/dev/apps/camdev/camdev.cpp b/isis/src/dev/apps/camdev/camdev.cpp
index 864883f3a2c3265edf7aa5811cbaacbc79854d31..d459ca3bf77516fe4de882ec76dd48bd617583b7 100644
--- a/isis/src/dev/apps/camdev/camdev.cpp
+++ b/isis/src/dev/apps/camdev/camdev.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 
 #include "Angle.h"
@@ -22,14 +30,14 @@
 using namespace std;
 
 
-namespace Isis { 
-  
+namespace Isis {
+
   // Global variables
   static Camera *cam;
   static TProjection *proj;
   static int nbands;
   static bool noCamera;
-  
+
   static bool dn;
   static bool ra;
   static bool declination;
@@ -66,7 +74,7 @@ namespace Isis {
   static bool subSolarLatitude;
   static bool subSolarLongitude;
   static bool subSolarGroundAzimuth;
-  static bool phase; 
+  static bool phase;
   static bool emission;
   static bool incidence;
   static bool localEmission;
@@ -83,28 +91,28 @@ namespace Isis {
   static bool solarLongitude;
   static bool morphologyRank;
   static bool albedoRank;
-  
-  
+
+
   static void camdevDN(Buffer &in, Buffer &out);
   static void camdev(Buffer &out);
-  
-  
+
+
   // Function to create a keyword with same values of a specified count
-  template <typename T> static PvlKeyword makeKey(const QString &name, 
-                                           const int &nvals, 
+  template <typename T> static PvlKeyword makeKey(const QString &name,
+                                           const int &nvals,
                                            const T &value);
-  
+
   // Structure containing new mosaic planes
   struct MosData {
     MosData() :  m_morph(Null), m_albedo(Null) {  }
     double m_morph;
     double m_albedo;
   };
-  
+
   // Computes the special MORPHOLOGYRANK and ALBEDORANK planes
   MosData *getMosaicIndicies(Camera &camera, MosData &md);
   // Updates BandBin keyword
-  static void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals, 
+  static void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals,
                      const QString &default_value = "Null");
 
 
@@ -126,7 +134,7 @@ namespace Isis {
     else {
       noCamera = true;
     }
-  
+
     if(noCamera) {
       try {
         proj = (TProjection *) icube->projection();
@@ -135,7 +143,7 @@ namespace Isis {
         QString msg = "Mosaic files must contain mapping labels";
         throw IException(e, IException::User, msg, _FILEINFO_);
       }
-    } 
+    }
     else {
       try {
         cam = icube->camera();
@@ -146,10 +154,10 @@ namespace Isis {
         throw IException(e, IException::User, msg, _FILEINFO_);
       }
     }
-  
+
     // We will be processing by brick.
     ProcessByBrick p;
-  
+
     // Find out which bands are to be created
     nbands = 0;
     ra = false;
@@ -183,7 +191,7 @@ namespace Isis {
     solarDistance = false;
     subSolarLatitude = false;
     subSolarLongitude = false;
-    subSolarGroundAzimuth = false;  
+    subSolarGroundAzimuth = false;
     phase = false;
     emission = false;
     incidence = false;
@@ -198,11 +206,11 @@ namespace Isis {
     ephemerisTime = false;
     UTC = false;
     localSolarTime = false;
-    solarLongitude = false;  
+    solarLongitude = false;
     morphologyRank = false;
-    albedoRank = false;  
-    
-    
+    albedoRank = false;
+
+
     if (!noCamera) {
       if ((ra = ui.GetBoolean("RADEC"))) nbands++;
       if ((declination = ui.GetBoolean("RADEC"))) nbands++;
@@ -235,13 +243,13 @@ namespace Isis {
       if ((solarDistance = ui.GetBoolean("SOLARDISTANCE"))) nbands++;
       if ((subSolarLatitude = ui.GetBoolean("SUBSOLARLATITUDE"))) nbands++;
       if ((subSolarLongitude = ui.GetBoolean("SUBSOLARLONGITUDE"))) nbands++;
-      if ((subSolarGroundAzimuth = ui.GetBoolean("SUBSOLARGROUNDAZIMUTH"))) nbands++;    
+      if ((subSolarGroundAzimuth = ui.GetBoolean("SUBSOLARGROUNDAZIMUTH"))) nbands++;
       if ((phase = ui.GetBoolean("PHASE"))) nbands++;
       if ((incidence = ui.GetBoolean("INCIDENCE"))) nbands++;
       if ((emission = ui.GetBoolean("EMISSION"))) nbands++;
       if ((localEmission = ui.GetBoolean("LOCALEMISSION"))) nbands++;
       if ((localIncidence = ui.GetBoolean("LOCALINCIDENCE"))) nbands++;
-      if ((northAzimuth = ui.GetBoolean("NORTHAZIMUTH"))) nbands++;    
+      if ((northAzimuth = ui.GetBoolean("NORTHAZIMUTH"))) nbands++;
       if ((distortedFocalPlaneX = ui.GetBoolean("DISTORTEDFOCALPLANE"))) nbands++;
       if ((distortedFocalPlaneY = ui.GetBoolean("DISTORTEDFOCALPLANE"))) nbands++;
       if ((undistortedFocalPlaneX = ui.GetBoolean("UNDISTORTEDFOCALPLANE"))) nbands++;
@@ -250,22 +258,22 @@ namespace Isis {
       if ((ephemerisTime = ui.GetBoolean("EPHEMERISTIME"))) nbands++;
       if ((UTC = ui.GetBoolean("UTC"))) nbands++;
       if ((localSolarTime = ui.GetBoolean("LOCALSOLARTIME"))) nbands++;
-      if ((solarLongitude = ui.GetBoolean("SOLARLONGITUDE"))) nbands++;   
-      if ((morphologyRank = ui.GetBoolean("MORPHOLOGYRANK"))) nbands++; 
+      if ((solarLongitude = ui.GetBoolean("SOLARLONGITUDE"))) nbands++;
+      if ((morphologyRank = ui.GetBoolean("MORPHOLOGYRANK"))) nbands++;
       if ((albedoRank = ui.GetBoolean("ALBEDORANK"))) nbands++;
-      
+
     }
     if((dn = ui.GetBoolean("DN"))) nbands++;
     if((planetocentricLatitude = ui.GetBoolean("PLANETOCENTRICLATITUDE"))) nbands++;
     if((positiveEast360Longitude = ui.GetBoolean("POSITIVEEAST360LONGITUDE"))) nbands++;
     if((pixelResolution = ui.GetBoolean("PIXELRESOLUTION"))) nbands++;
-  
+
     if(nbands < 1) {
       QString message = "At least one parameter must be entered"
                        "[PHASE, EMISSION, INCIDENCE, LATITUDE, LONGITUDE...]";
       throw IException(IException::User, message, _FILEINFO_);
     }
-  
+
     // If outputting a a dn band, retrieve the orignal values for the filter name from the input cube,
     // if it exists.  Otherwise, the default will be "DN"
     QString bname = "DN";
@@ -278,7 +286,7 @@ namespace Isis {
         bname = mybb["FilterName"][0];
       }
     }
-  
+
     // Create a bandbin group for the output label
     PvlKeyword name("Name");
     if (dn) name += bname;
@@ -297,7 +305,7 @@ namespace Isis {
     if (pixelResolution) name += "Pixel Resolution";
     if (lineResolution) name += "Line Resolution";
     if (sampleResolution) name += "Sample Resolution";
-    if (detectorResolution) name += "Detector Resolution";  
+    if (detectorResolution) name += "Detector Resolution";
     if (spacecraftPositionX) name += "Spacecraft Position X";
     if (spacecraftPositionY) name += "Spacecraft Position Y";
     if (spacecraftPositionZ) name += "Spacecraft Position Z";
@@ -334,17 +342,17 @@ namespace Isis {
     if (solarLongitude) name += "Solar Longitude";
     if (morphologyRank) name += "morphologyRank";
     if (albedoRank) name += "albedoRank";
-    
-    
-  
-  
+
+
+
+
     // Create the output cube.  Note we add the input cube to expedite propagation
     // of input cube elements (label, blobs, etc...).  It will be cleared
     // prior to systematic processing only if the DN option is not selected.
-    // If DN is chosen by the user, then we propagate the input buffer with a 
+    // If DN is chosen by the user, then we propagate the input buffer with a
     // different function - one that accepts both input and output buffers.
     p.SetInputCube(icube, OneBand);
-    Cube *ocube = p.SetOutputCube(ui.GetFileName("TO"), ui.GetOutputAttribute("TO"), icube->sampleCount(), 
+    Cube *ocube = p.SetOutputCube(ui.GetFileName("TO"), ui.GetOutputAttribute("TO"), icube->sampleCount(),
                                   icube->lineCount(), nbands);
     p.SetBrickSize(64, 64, nbands);
     if (dn) {
@@ -364,25 +372,25 @@ namespace Isis {
     if(!cobj.hasGroup("BandBin")) {
       cobj.addGroup(PvlGroup("BandBin"));
     }
-    
+
     PvlGroup &bb = cobj.findGroup("BandBin");
     bb.addKeyword(name, PvlContainer::Replace);
     int nvals = name.size();
     UpdateBandKey("Center", bb, nvals, "1.0");
-    
+
     if ( bb.hasKeyword("OriginalBand") ) {
       UpdateBandKey("OriginalBand", bb, nvals, "1.0");
     }
-    
+
     if ( bb.hasKeyword("Number") ) {
       UpdateBandKey("Number", bb, nvals, "1.0");
     }
-    
+
     UpdateBandKey("Width", bb, nvals, "1.0");
     p.EndProcess();
   }
-  
-  
+
+
   //  This propagates the input plane to the output plane, then passes it off to
   //  the general routine
   void camdevDN(Buffer &in, Buffer &out) {
@@ -391,8 +399,8 @@ namespace Isis {
     }
     camdev(out);
   }
-  
-  
+
+
   //  Computes all the geometric properties for the output buffer.  Certain
   //  knowledge of the buffers size is assumed below, so ensure the buffer
   //  is still of the expected size.
@@ -402,13 +410,13 @@ namespace Isis {
     int skipDN = (dn) ? 64 * 64   :  0;
     for(int i = 0; i < 64; i++) {
       for(int j = 0; j < 64; j++) {
-  
+
         MosData mosd, *p_mosd(0);  // For special mosaic angles
-  
+
         int index = i * 64 + j + skipDN;
         double samp = out.Sample(index);
         double line = out.Line(index);
-  
+
         bool isGood=false;
         if (noCamera) {
           isGood = proj->SetWorld(samp, line);
@@ -416,7 +424,7 @@ namespace Isis {
         else {
           isGood = cam->SetImage(samp, line);
         }
-  
+
         if (isGood) {
           if (ra) {
             out[index] = cam->RightAscension();
@@ -439,9 +447,9 @@ namespace Isis {
             if (planetographicLatitude) {
               Distance radii[3];
               cam->radii(radii);
-              double ocentricLat; 
+              double ocentricLat;
               ocentricLat = cam->UniversalLatitude();
-              out[index] = TProjection::ToPlanetographic(ocentricLat, radii[0].kilometers(), 
+              out[index] = TProjection::ToPlanetographic(ocentricLat, radii[0].kilometers(),
                                                    radii[2].kilometers());
               index += 64 * 64;
             }
@@ -534,7 +542,7 @@ namespace Isis {
           }
           if(!noCamera) {
             double ssplat, ssplon;
-            ssplat = 0.0; 
+            ssplat = 0.0;
             ssplon = 0.0;
             cam->subSpacecraftPoint(ssplat, ssplon);
             if(subSpacecraftLatitude) {
@@ -615,17 +623,17 @@ namespace Isis {
             Angle emission;
             bool success;
             cam->LocalPhotometricAngles(phase, incidence, emission, success);
-  
+
             if (localEmission) {
               out[index] = emission.degrees();
               index += 64 * 64;
             }
-  
+
             if (localIncidence) {
               out[index] = incidence.degrees();
               index += 64 * 64;
             }
-          }        
+          }
           if(northAzimuth) {
             out[index] = cam->NorthAzimuth();
             index += 64 * 64;
@@ -671,7 +679,7 @@ namespace Isis {
             out[index] = mosd.m_morph;
             index += 64 * 64;
           }
-  
+
           if (albedoRank) {
             if (!p_mosd) { p_mosd = getMosaicIndicies(*cam, mosd); }
             out[index] = mosd.m_albedo;
@@ -688,8 +696,8 @@ namespace Isis {
       }
     }
   }
-  
-  
+
+
   // Function to create a keyword with same values of a specified count
   template <typename T>
     PvlKeyword makeKey(const QString &name, const int &nvals,
@@ -700,8 +708,8 @@ namespace Isis {
       }
       return (key);
     }
-  
-  
+
+
   // Computes the special morphologyRank and albedoRank planes
   MosData *getMosaicIndicies(Camera &camera, MosData &md) {
     const double Epsilon(1.0E-8);
@@ -716,7 +724,7 @@ namespace Isis {
     }
     double res = camera.PixelResolution();
     if (fabs(res) < Epsilon) res = Epsilon;
-  
+
     md = MosData();  // Nullifies the data
     if (myemission.isValid()) {
       // Compute morphologyRank
@@ -724,7 +732,7 @@ namespace Isis {
       if (fabs(cose) < Epsilon) cose = Epsilon;
       // Convert resolution to units of KM
       md.m_morph = (res / 1000.0) / cose;
-  
+
       if (myincidence.isValid()) {
         // Compute albedoRank
         double cosi = cos(myincidence.radians());
@@ -733,11 +741,11 @@ namespace Isis {
         md.m_albedo = (res / 1000.0 ) * ( (1.0 / cose) + (1.0 / cosi) );
       }
     }
-  
+
     return (&md);
   }
-  
-  
+
+
   //  Updates existing BandBin keywords with additional values to ensure
   //  label compilancy (which should support Camera models).  It checks for the
   //  existance of the keyword and uses its (assumed) first value to set nvals
@@ -745,14 +753,14 @@ namespace Isis {
   //  value.
   void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals,
                      const QString &default_value) {
-  
+
     QString defVal(default_value);
     if ( bb.hasKeyword(keyname) ) {
       defVal = bb[keyname][0];
     }
-  
+
     bb.addKeyword(makeKey(keyname, nvals, defVal), PvlContainer::Replace);
     return;
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/isis/src/dev/apps/camdev/camdev.h b/isis/src/dev/apps/camdev/camdev.h
index bb0e38a09abf42f183f60d0021753281f9030498..df6577e13f71ba2daa44a62dd790f77c9a684101 100644
--- a/isis/src/dev/apps/camdev/camdev.h
+++ b/isis/src/dev/apps/camdev/camdev.h
@@ -1,6 +1,14 @@
-#ifndef camdev_h 
+#ifndef camdev_h
 #define camdev_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 #include "Cube.h"
 
@@ -9,4 +17,4 @@ namespace Isis {
   extern void camdev(UserInterface &ui);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/isis/src/dev/apps/camdev/main.cpp b/isis/src/dev/apps/camdev/main.cpp
index 05ea262494c0eda061c5f48eeffcb632db011b96..bb3b9668153f13c77b5ed59ab15424355bf146d5 100644
--- a/isis/src/dev/apps/camdev/main.cpp
+++ b/isis/src/dev/apps/camdev/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cmath>
@@ -64,7 +72,7 @@ bool solarDistance;
 bool subSolarLatitude;
 bool subSolarLongitude;
 bool subSolarGroundAzimuth;
-bool phase; 
+bool phase;
 bool emission;
 bool incidence;
 bool localEmission;
@@ -89,8 +97,8 @@ void camdev(Buffer &out);
 
 
 // Function to create a keyword with same values of a specified count
-template <typename T> PvlKeyword makeKey(const QString &name, 
-                                         const int &nvals, 
+template <typename T> PvlKeyword makeKey(const QString &name,
+                                         const int &nvals,
                                          const T &value);
 
 // Structure containing new mosaic planes
@@ -103,7 +111,7 @@ struct MosData {
 // Computes the special MORPHOLOGYRANK and ALBEDORANK planes
 MosData *getMosaicIndicies(Camera &camera, MosData &md);
 // Updates BandBin keyword
-void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals, 
+void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals,
                    const QString &default_value = "Null");
 
 
@@ -130,7 +138,7 @@ void IsisMain() {
       QString msg = "Mosaic files must contain mapping labels";
       throw IException(e, IException::User, msg, _FILEINFO_);
     }
-  } 
+  }
   else {
     try {
       cam = icube->camera();
@@ -178,7 +186,7 @@ void IsisMain() {
   solarDistance = false;
   subSolarLatitude = false;
   subSolarLongitude = false;
-  subSolarGroundAzimuth = false;  
+  subSolarGroundAzimuth = false;
   phase = false;
   emission = false;
   incidence = false;
@@ -193,11 +201,11 @@ void IsisMain() {
   ephemerisTime = false;
   UTC = false;
   localSolarTime = false;
-  solarLongitude = false;  
+  solarLongitude = false;
   morphologyRank = false;
-  albedoRank = false;  
-  
-  
+  albedoRank = false;
+
+
   if (!noCamera) {
     if ((ra = ui.GetBoolean("RADEC"))) nbands++;
     if ((declination = ui.GetBoolean("RADEC"))) nbands++;
@@ -230,13 +238,13 @@ void IsisMain() {
     if ((solarDistance = ui.GetBoolean("SOLARDISTANCE"))) nbands++;
     if ((subSolarLatitude = ui.GetBoolean("SUBSOLARLATITUDE"))) nbands++;
     if ((subSolarLongitude = ui.GetBoolean("SUBSOLARLONGITUDE"))) nbands++;
-    if ((subSolarGroundAzimuth = ui.GetBoolean("SUBSOLARGROUNDAZIMUTH"))) nbands++;    
+    if ((subSolarGroundAzimuth = ui.GetBoolean("SUBSOLARGROUNDAZIMUTH"))) nbands++;
     if ((phase = ui.GetBoolean("PHASE"))) nbands++;
     if ((incidence = ui.GetBoolean("INCIDENCE"))) nbands++;
     if ((emission = ui.GetBoolean("EMISSION"))) nbands++;
     if ((localEmission = ui.GetBoolean("LOCALEMISSION"))) nbands++;
     if ((localIncidence = ui.GetBoolean("LOCALINCIDENCE"))) nbands++;
-    if ((northAzimuth = ui.GetBoolean("NORTHAZIMUTH"))) nbands++;    
+    if ((northAzimuth = ui.GetBoolean("NORTHAZIMUTH"))) nbands++;
     if ((distortedFocalPlaneX = ui.GetBoolean("DISTORTEDFOCALPLANE"))) nbands++;
     if ((distortedFocalPlaneY = ui.GetBoolean("DISTORTEDFOCALPLANE"))) nbands++;
     if ((undistortedFocalPlaneX = ui.GetBoolean("UNDISTORTEDFOCALPLANE"))) nbands++;
@@ -245,10 +253,10 @@ void IsisMain() {
     if ((ephemerisTime = ui.GetBoolean("EPHEMERISTIME"))) nbands++;
     if ((UTC = ui.GetBoolean("UTC"))) nbands++;
     if ((localSolarTime = ui.GetBoolean("LOCALSOLARTIME"))) nbands++;
-    if ((solarLongitude = ui.GetBoolean("SOLARLONGITUDE"))) nbands++;   
-    if ((morphologyRank = ui.GetBoolean("MORPHOLOGYRANK"))) nbands++; 
+    if ((solarLongitude = ui.GetBoolean("SOLARLONGITUDE"))) nbands++;
+    if ((morphologyRank = ui.GetBoolean("MORPHOLOGYRANK"))) nbands++;
     if ((albedoRank = ui.GetBoolean("ALBEDORANK"))) nbands++;
-    
+
   }
   if((dn = ui.GetBoolean("DN"))) nbands++;
   if((planetocentricLatitude = ui.GetBoolean("PLANETOCENTRICLATITUDE"))) nbands++;
@@ -292,7 +300,7 @@ void IsisMain() {
   if (pixelResolution) name += "Pixel Resolution";
   if (lineResolution) name += "Line Resolution";
   if (sampleResolution) name += "Sample Resolution";
-  if (detectorResolution) name += "Detector Resolution";  
+  if (detectorResolution) name += "Detector Resolution";
   if (spacecraftPositionX) name += "Spacecraft Position X";
   if (spacecraftPositionY) name += "Spacecraft Position Y";
   if (spacecraftPositionZ) name += "Spacecraft Position Z";
@@ -329,17 +337,17 @@ void IsisMain() {
   if (solarLongitude) name += "Solar Longitude";
   if (morphologyRank) name += "morphologyRank";
   if (albedoRank) name += "albedoRank";
-  
-  
+
+
 
 
   // Create the output cube.  Note we add the input cube to expedite propagation
   // of input cube elements (label, blobs, etc...).  It will be cleared
   // prior to systematic processing only if the DN option is not selected.
-  // If DN is chosen by the user, then we propagate the input buffer with a 
+  // If DN is chosen by the user, then we propagate the input buffer with a
   // different function - one that accepts both input and output buffers.
   (void) p.SetInputCube("FROM", OneBand);
-  Cube *ocube = p.SetOutputCube("TO", icube->sampleCount(), 
+  Cube *ocube = p.SetOutputCube("TO", icube->sampleCount(),
                                 icube->lineCount(), nbands);
   p.SetBrickSize(64, 64, nbands);
 
@@ -443,9 +451,9 @@ void camdev(Buffer &out) {
           if (planetographicLatitude) {
             Distance radii[3];
             cam->radii(radii);
-            double ocentricLat; 
+            double ocentricLat;
             ocentricLat = cam->UniversalLatitude();
-            out[index] = TProjection::ToPlanetographic(ocentricLat, radii[0].kilometers(), 
+            out[index] = TProjection::ToPlanetographic(ocentricLat, radii[0].kilometers(),
                                                  radii[2].kilometers());
             index += 64 * 64;
           }
@@ -538,7 +546,7 @@ void camdev(Buffer &out) {
         }
         if(!noCamera) {
           double ssplat, ssplon;
-          ssplat = 0.0; 
+          ssplat = 0.0;
           ssplon = 0.0;
           cam->subSpacecraftPoint(ssplat, ssplon);
           if(subSpacecraftLatitude) {
@@ -629,7 +637,7 @@ void camdev(Buffer &out) {
             out[index] = incidence.degrees();
             index += 64 * 64;
           }
-        }        
+        }
         if(northAzimuth) {
           out[index] = cam->NorthAzimuth();
           index += 64 * 64;
@@ -758,4 +766,3 @@ void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals,
   bb.addKeyword(makeKey(keyname, nvals, defVal), PvlContainer::Replace);
   return;
 }
-
diff --git a/isis/src/dev/apps/camtest/main.cpp b/isis/src/dev/apps/camtest/main.cpp
index 4484d7054e8d66b935f8169c0f6bcd690ad2710f..0bc50fb784c87a2dd70351fc8734a9866f0bd9ff 100644
--- a/isis/src/dev/apps/camtest/main.cpp
+++ b/isis/src/dev/apps/camtest/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "Camera.h"
@@ -21,7 +29,7 @@ enum OutputType {
 
 /**
  * Functor for collecting camera statistics.
- * 
+ *
  * @author 2016-11-16 Jesse Mapel
  * @internal
  *   @history 2016-11-16 Original Version.
@@ -29,12 +37,12 @@ enum OutputType {
 class CamTestFunctor {
 public:
   CamTestFunctor() {};
-  ~CamTestFunctor() {};  
+  ~CamTestFunctor() {};
   void setCamera(Camera* cam);
   void setOutType(OutputType outType);
   void setResults(Statistics* results);
   void operator()(Buffer &in, Buffer &out) const;
-  
+
 private:
   Camera* m_cam;
   OutputType m_outType;
@@ -50,10 +58,10 @@ void IsisMain() {
   Cube *iCube = p.SetInputCube("FROM");
   Camera *cam = iCube->camera();
   p.SetOutputCube("TO");
-  
+
   // Set to process by line
   p.SetBrickSize(iCube->sampleCount(), 1, 1);
-  
+
   IString format = ui.GetString("FORMAT");
 
   OutputType outFormat = Lat;
@@ -79,9 +87,9 @@ void IsisMain() {
   func.setOutType(outFormat);
   Statistics resultsStats;
   func.setResults(&resultsStats);
-  
+
   p.ProcessCube(func, false);
-  
+
   // Collect results
   PvlGroup results = PvlGroup("CamTestResults");
   results += PvlKeyword("FailedConversionsToLatLong", toString(resultsStats.LrsPixels()));
@@ -93,15 +101,15 @@ void IsisMain() {
     results += PvlKeyword("Minimum", toString(resultsStats.Minimum()));
     results += PvlKeyword("Maximum", toString(resultsStats.Maximum()));
   }
-  
+
   // Log output results
   Application::Log(results);
-  
+
   p.EndProcess();
 }
 
 // Functor Definitions
-  
+
 void CamTestFunctor::setCamera(Camera* cam) {
   m_cam = cam;
 }
@@ -154,7 +162,7 @@ void CamTestFunctor::operator()(Buffer &in, Buffer &out) const {
 
     }
   }
-  
+
   m_resultsStats->AddData(out.DoubleBuffer(), out.size());
 }
 /* Old Processing Routine
@@ -200,4 +208,4 @@ void doIt(Buffer &in, Buffer &out) {
     }
   }
 }
-*/
\ No newline at end of file
+*/
diff --git a/isis/src/dev/apps/m3loc2net/main.cpp b/isis/src/dev/apps/m3loc2net/main.cpp
index 3f923128ef6a43621cbb1f86837e1e9335a1ebec..b6473f8215cf8dfdd13baf82564a76c18848ad65 100644
--- a/isis/src/dev/apps/m3loc2net/main.cpp
+++ b/isis/src/dev/apps/m3loc2net/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Brick.h"
@@ -114,7 +122,7 @@ void IsisMain() {
         samp = inputCube.sampleCount() - sampInc - 1;
         qDebug()<<"lastSamp = "<<samp;
       }
- 
+
 //      gridStatus.CheckStatus();
     }
     //  Make sure last line is always included
@@ -126,4 +134,3 @@ void IsisMain() {
 
   cnet.Write(ui.GetFileName("ONET"));
 }
-
diff --git a/isis/src/galileo/apps/gllnims2isis/main.cpp b/isis/src/galileo/apps/gllnims2isis/main.cpp
index ed07532e02f35a4a01226aacfa8ebde057b549d1..b270ae909f63170ff529265c9f9613b8810ab259 100644
--- a/isis/src/galileo/apps/gllnims2isis/main.cpp
+++ b/isis/src/galileo/apps/gllnims2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 //ISIS libraries
@@ -240,7 +248,7 @@ PvlGroup originalMappingGroup = qube.findGroup("IMAGE_MAP_PROJECTION", Pvl::Trav
   importPds.SetSuffixOffset(importPds.Samples(),importPds.Lines(),g_coreBands,g_coreItemBytes);
   g_suffixCube->addCachingAlgorithm(new BoxcarCachingAlgorithm());
 
-  importPds.StartProcess(); 
+  importPds.StartProcess();
   translateNIMSLabels(*pdsLabel,g_suffixCube,inFile,SUFFIX);
   importPds.EndProcess();
 
@@ -256,13 +264,13 @@ PvlGroup originalMappingGroup = qube.findGroup("IMAGE_MAP_PROJECTION", Pvl::Trav
   mappingInfo += Isis::PvlKeyword("MinimumLatitude");
   mappingInfo += Isis::PvlKeyword("MaximumLatitude");
   mappingInfo += Isis::PvlKeyword("MinimumLongitude");
-  mappingInfo += Isis::PvlKeyword("MaximumLongitude"); 
+  mappingInfo += Isis::PvlKeyword("MaximumLongitude");
   mappingInfo += Isis::PvlKeyword("MapProjectionType");
-  mappingInfo += Isis::PvlKeyword("MapScale"); 
-  mappingInfo += Isis::PvlKeyword("MapProjectionRotation"); 
-  mappingInfo += Isis::PvlKeyword("MajorEquatorialRadius"); 
-  mappingInfo += Isis::PvlKeyword("MinorEquatorialRadius"); 
-  mappingInfo += Isis::PvlKeyword("PolarRadius"); 
+  mappingInfo += Isis::PvlKeyword("MapScale");
+  mappingInfo += Isis::PvlKeyword("MapProjectionRotation");
+  mappingInfo += Isis::PvlKeyword("MajorEquatorialRadius");
+  mappingInfo += Isis::PvlKeyword("MinorEquatorialRadius");
+  mappingInfo += Isis::PvlKeyword("PolarRadius");
 
   if (originalMappingGroup["COORDINATE_SYSTEM_NAME"][0] == "PLANETOCENTRIC") {
     mappingInfo["LatitudeType"] = "Planetocentric";
@@ -314,7 +322,7 @@ PvlGroup originalMappingGroup = qube.findGroup("IMAGE_MAP_PROJECTION", Pvl::Trav
   coreCube.close();
   suffixCube.close();
 
-// Mapping group code -- keep in case we can use this in the future. 
+// Mapping group code -- keep in case we can use this in the future.
 
 #if 0
   // Reopen the cubes in order to fix the mapping group
@@ -412,7 +420,7 @@ PvlGroup originalMappingGroup = qube.findGroup("IMAGE_MAP_PROJECTION", Pvl::Trav
 
   coreCube.close();
   suffixCube.close();
-#endif 
+#endif
 }
 
 
@@ -593,4 +601,3 @@ void ProcessBands(Pvl &pdsLab, Cube *nimsCube, ProcessImportPds &importPds) {
   importPds.SetBase(base);
   nimsCube->putGroup(bandBin);
 }
-
diff --git a/isis/src/galileo/apps/gllssi2isis/main.cpp b/isis/src/galileo/apps/gllssi2isis/main.cpp
index 3c7f5922b940289f6056a1bc231cef23f5443d63..e2aeb48748d3d9c591d2efc4973cbc322adde991 100644
--- a/isis/src/galileo/apps/gllssi2isis/main.cpp
+++ b/isis/src/galileo/apps/gllssi2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "CubeAttribute.h"
diff --git a/isis/src/galileo/apps/gllssical/main.cpp b/isis/src/galileo/apps/gllssical/main.cpp
index c805c1e768d88cc88185a68c57c3ad828ebbbb8b..e442d0b00a13990575bac36210f7102f31112d15 100644
--- a/isis/src/galileo/apps/gllssical/main.cpp
+++ b/isis/src/galileo/apps/gllssical/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "Buffer.h"
diff --git a/isis/src/galileo/objs/SsiCamera/SsiCamera.cpp b/isis/src/galileo/objs/SsiCamera/SsiCamera.cpp
index a2826a5345f398c50ecdaa2a9eeb94598519ad14..0bca4d9f81bc0d025797750dd6ef5cf39a52902f 100644
--- a/isis/src/galileo/objs/SsiCamera/SsiCamera.cpp
+++ b/isis/src/galileo/objs/SsiCamera/SsiCamera.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2008/05/14 21:07:11 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "SsiCamera.h"
 
 #include <QString>
@@ -41,10 +28,10 @@ using namespace std;
 namespace Isis {
   /**
    * Constructs a SsiCamera object using the image labels.
-   *  
-   * @param lab Pvl label from a Galileo SSI image. 
-   *  
-   * @internal 
+   *
+   * @param lab Pvl label from a Galileo SSI image.
+   *
+   * @internal
    *   @history 2011-05-03 Jeannie Walldren - Added NAIF error check. Added call
    *                          to ShutterOpenCloseTimes() method.
    */
@@ -53,7 +40,7 @@ namespace Isis {
     m_instrumentNameShort = "SSI";
     m_spacecraftNameLong = "Galileo Orbiter";
     m_spacecraftNameShort = "Galileo";
-    
+
     NaifStatus::CheckErrors();
     // Get the camera characteristics
     double k1;
@@ -100,9 +87,9 @@ namespace Isis {
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
 
     focalMap->SetDetectorOrigin(
-      Spice::getDouble("INS" + toString(naifIkCode()) + 
+      Spice::getDouble("INS" + toString(naifIkCode()) +
                        "_BORESIGHT_SAMPLE"),
-      Spice::getDouble("INS" + toString(naifIkCode()) + 
+      Spice::getDouble("INS" + toString(naifIkCode()) +
                        "_BORESIGHT_LINE"));
 
     // Setup distortion map
@@ -152,12 +139,12 @@ namespace Isis {
 
 /**
  * This is the function that is called in order to instantiate a SsiCamera
- * object. 
+ * object.
  *
  * @param lab Cube labels
  *
- * @return Isis::Camera* SsiCamera 
- * @internal 
+ * @return Isis::Camera* SsiCamera
+ * @internal
  *   @history 2011-05-03 Jeannie Walldren - Added documentation.  Removed
  *            Galileo namespace.
  */
diff --git a/isis/src/galileo/objs/SsiCamera/SsiCamera.h b/isis/src/galileo/objs/SsiCamera/SsiCamera.h
index c937586269b1b60c9872e1c74948bc66ee6ec9f5..13cdc18baee5ef14f3afde72a209c19fff435964 100644
--- a/isis/src/galileo/objs/SsiCamera/SsiCamera.h
+++ b/isis/src/galileo/objs/SsiCamera/SsiCamera.h
@@ -1,36 +1,26 @@
 #ifndef SsiCamera_h
 #define SsiCamera_h
-/**
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "FramingCamera.h"
 
 namespace Isis {
   /**
-   * This is the camera model for the Galileo Solid State Imaging Camera 
+   * This is the camera model for the Galileo Solid State Imaging Camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Galileo
-   *  
+   *
    * @see http://astrogeology.usgs.gov/Missions/Galileo
    * @see http://www2.jpl.nasa.gov/galileo/sepo
-   * @see http://pds-imaging.jpl.nasa.gov/portal/galileo_mission.html 
+   * @see http://pds-imaging.jpl.nasa.gov/portal/galileo_mission.html
    *
    *
    * @author ????-??-?? Jeff Anderson
@@ -52,12 +42,12 @@ namespace Isis {
    *                          Updated documentation. Replaced Galileo namespace
    *                          wrap with Isis namespace. Added Isis Disclaimer to
    *                          files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to
    *                           test these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -71,24 +61,24 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-77001); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (2); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (21); }
diff --git a/isis/src/galileo/objs/SsiCamera/unitTest.cpp b/isis/src/galileo/objs/SsiCamera/unitTest.cpp
index e6737ca9971a99d08f28ba202fef40d35505848d..f68d45e6bc7166e153535c023e8fc50ff4784e91 100644
--- a/isis/src/galileo/objs/SsiCamera/unitTest.cpp
+++ b/isis/src/galileo/objs/SsiCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -60,10 +49,10 @@ int main(void) {
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
 
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
-    double exposureDuration = ((double) inst["ExposureDuration"])/1000; 
+    double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
     double et; // StartTime keyword is the center exposure time
     str2et_c(stime.toLatin1().data(), &et);
@@ -106,7 +95,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -139,4 +128,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.cpp b/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.cpp
index 7588718c7803310bfca97033a74f467d79ff396d..1f8fa66c5622a98a7a8e24f6a2f9015e1eca192d 100644
--- a/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.cpp
+++ b/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 6715 $
- * $Date: 2016-04-28 10:58:43 -0700 (Thu, 28 Apr 2016) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AmicaImportFits.h"
 
 #include <cctype>
diff --git a/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.h b/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.h
index 63237afddfa146ea2161764bb85ee0b3731f5b4d..cbb5870e5a0330ad140352114080cea90dfd1a0a 100644
--- a/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.h
+++ b/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.h
@@ -1,26 +1,13 @@
 #ifndef AmicaImportFits_h
 #define AmicaImportFits_h
-/**
- * @file
- * $Revision: 5602 $
- * $Date: 2013-11-27 11:40:00 -0700 (Wed, 27 Nov 2013) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 
diff --git a/isis/src/hayabusa/apps/amica2isis/main.cpp b/isis/src/hayabusa/apps/amica2isis/main.cpp
index c4ad2136635bae040c68de511baa7f52b820952b..16cb76ce3b3ff5218190d10ef2ac3c62c4ac30e0 100644
--- a/isis/src/hayabusa/apps/amica2isis/main.cpp
+++ b/isis/src/hayabusa/apps/amica2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
diff --git a/isis/src/hayabusa/apps/amicacal/AmicaCalUtils.h b/isis/src/hayabusa/apps/amicacal/AmicaCalUtils.h
index 1d02e8cfe3bcb79a2719864442d40fb0881fad1f..f1974d7e4c10ef4bcb0de80c9d2a42f29448b43a 100644
--- a/isis/src/hayabusa/apps/amicacal/AmicaCalUtils.h
+++ b/isis/src/hayabusa/apps/amicacal/AmicaCalUtils.h
@@ -1,6 +1,14 @@
 #ifndef AmicaCalUtils_h
 #define AmicaCalUtils_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
@@ -49,7 +57,7 @@ static void loadNaifTiming() {
 //  Load the NAIF kernels to determine timing data
     Isis::FileName leapseconds("$base/kernels/lsk/naif????.tls");
     leapseconds = leapseconds.highestVersion();
-    Isis::FileName sclk("$hayabusa/kernels/sclk/hayabusa.tsc");    
+    Isis::FileName sclk("$hayabusa/kernels/sclk/hayabusa.tsc");
     Isis::FileName pck1("$hayabusa/kernels/tspk/de403s.bsp");
     Isis::FileName pck2("$hayabusa/kernels/tspk/sb_25143_140.bsp");
     Isis::FileName pck3("$hayabusa/kernels/spk/hay_jaxa_050916_051119_v1n.bsp");
@@ -85,7 +93,7 @@ static void loadNaifTiming() {
  *
  * This method requires the appropriate NAIK kernels to be loaded that
  * provides instrument time support, leap seconds and planet body ephemeris.
- *  
+ *
  * @return @b double Distance in AU between Sun and observed body.
  */
 static bool sunDistanceAU(const QString &scStartTime,
@@ -230,7 +238,7 @@ void  translate(Cube *flatField, int *transform, QString fname) {
   Mat originalCropped = temp(Rect(startsample,startline,width+1,height+1));
 
 
-  if (scale ==1) {   
+  if (scale ==1) {
     mat2isis(&originalCropped,fname);
   }
   else {
@@ -303,7 +311,7 @@ static double f_unfocused(double * A,double * sigma, int N,int binning,double x,
   double r = sqrt(X*X+Y*Y);
   double sum = 0;
 
-  for (int i = 0; i < N; i ++)   {     
+  for (int i = 0; i < N; i ++)   {
     sum += (A[i]/(sigma[i]*sqrt(2.0*pi_c() ) ) )*exp(-(r*r)/(2*sigma[i]*sigma[i]) );
   }
 
@@ -345,9 +353,9 @@ double * setPSFFilter(int size, double *A,double *sigma, double alpha,int N,int
          i++;
        }
        else {
-         psfVals[i]=f_unfocused(A,sigma,N,binning,x,y) +f_focused(alpha,binning,x,y);                 
+         psfVals[i]=f_unfocused(A,sigma,N,binning,x,y) +f_focused(alpha,binning,x,y);
          i++;
-       }      
+       }
     }
   }
 
@@ -360,4 +368,3 @@ double * setPSFFilter(int size, double *A,double *sigma, double alpha,int N,int
 
 
 #endif
-
diff --git a/isis/src/hayabusa/apps/amicacal/main.cpp b/isis/src/hayabusa/apps/amicacal/main.cpp
index 8ceecb5fae70be5ccccc15db3e7c721f47c760b8..d9a62c7591153a44710dab91fb7516f91500cfe1 100644
--- a/isis/src/hayabusa/apps/amicacal/main.cpp
+++ b/isis/src/hayabusa/apps/amicacal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // $Id: amicacal.cpp 6045 2015-02-07 02:06:59Z moses@GS.DOI.NET $
 #include "Isis.h"
 
@@ -43,7 +51,7 @@ void calibrate(vector<Buffer *>& in, vector<Buffer *>& out);
 QString loadCalibrationVariables(const QString &config);
 
 #if 0
-// PSF correction is currently not working and has been removed as an option. 
+// PSF correction is currently not working and has been removed as an option.
 //void psfCorrection(vector<Buffer *>& in, vector<Buffer *>& out);
 //void psfCorrectionBoxcar(Buffer &in, double &result);
 #endif
@@ -120,8 +128,8 @@ static double g_radStd = 3.42E-3;//!< Base conversion for all filters (Tbl. 9)
 static QVector<Pixel> hotPixelVector;  //!< A pixel vector that contains the Hot Pixel locations
 
 #if 0
-// PSF correction is currently not working and has been removed as an option. 
-// PSF variables 
+// PSF correction is currently not working and has been removed as an option.
+// PSF variables
 //static bool g_applyPSF = false;
 //static int ns, nl, nb;     //!< Number of samples, lines, bands of the input cube
 //static int g_size = 23;   //!< The size of the Boxcar used for calculating the light diffusion model.
@@ -148,14 +156,14 @@ void IsisMain() {
 
   Cube *inputCube = process.SetInputCube("FROM");
 #if 0
-// PSF correction is currently not working and has been removed as an option. 
+// PSF correction is currently not working and has been removed as an option.
 //  g_applyPSF = ui.GetBoolean("APPLYPSF");
 #endif
 
   // Basic assurances...
   if (inputCube->bandCount() != 1) {
-    throw IException(IException::User, 
-                     "AMICA images may only contain one band", 
+    throw IException(IException::User,
+                     "AMICA images may only contain one band",
                      _FILEINFO_);
   }
 
@@ -174,17 +182,17 @@ void IsisMain() {
 
   //Set up binning and image subarea mapping
 
-  AlphaCube myAlpha(1024, 1024, inputCube->sampleCount(), 
-                    inputCube->lineCount(), 
-                    startSample + 1, 
-                    startLine + 1, 
-                    lastSample + 1, 
+  AlphaCube myAlpha(1024, 1024, inputCube->sampleCount(),
+                    inputCube->lineCount(),
+                    startSample + 1,
+                    startLine + 1,
+                    lastSample + 1,
                     lastLine + 1);
 
   alpha = &myAlpha;
 
   try {
-    g_exposureTime = inst["ExposureDuration"] ; 
+    g_exposureTime = inst["ExposureDuration"] ;
   }
   catch(IException &e) {
     QString msg = "Unable to read [ExposureDuration] keyword in the Instrument group "
@@ -212,7 +220,7 @@ void IsisMain() {
   int lastline = inst["LastLine"];
   int lastsample = inst["LastSample"];
 
-  nsubImages = archive["SubImageCount"];  // If > 1, some correction is 
+  nsubImages = archive["SubImageCount"];  // If > 1, some correction is
                                           // not needed/performed
 
   QString compmode = archive["OutputMode"];
@@ -261,14 +269,14 @@ void IsisMain() {
   }
   else {
     // Image is cropped so we have to deal with it
-    FileName transFlat = FileName::createTempFile("$TEMPORARY/" 
-                                                  + flatfile.baseName() 
+    FileName transFlat = FileName::createTempFile("$TEMPORARY/"
+                                                  + flatfile.baseName()
                                                   + "_translated.cub");
 
     Cube *flatOriginal = new Cube(flatfile.expanded() );
-    
+
     int transform[5] = {binning, startsample, firstLine, lastsample, lastline};
-    
+
     // Translates and scales the flatfield image.  Scaling
     // might be necessary in the event that the raw image was also binned.
 
@@ -276,7 +284,7 @@ void IsisMain() {
 
     QScopedPointer<Cube, TemporaryCubeDeleter> translated(new Cube(transFlat.expanded(), "r"));
     flatcube.swap(translated);
-    
+
     CubeAttributeInput att;
     process.SetInputCube(transFlat.expanded(), att);
   }
@@ -285,7 +293,7 @@ void IsisMain() {
   QString fname = outputCube->fileName();
 
 #if 0
-// PSF correction is currently not working and has been removed as an option. 
+// PSF correction is currently not working and has been removed as an option.
   //ns = inputCube->sampleCount();
   //nl = inputCube->lineCount();
   //nb = inputCube->bandCount();
@@ -299,8 +307,8 @@ void IsisMain() {
   QString g_units = "DN";
 
   if ( !sunDistanceAU(startTime, target, g_solarDist) ) {
-     throw IException(IException::Programmer, 
-                      "Cannot calculated distance to sun!", 
+     throw IException(IException::Programmer,
+                      "Cannot calculated distance to sun!",
                       _FILEINFO_);
   }
 
@@ -311,35 +319,35 @@ void IsisMain() {
   }
   else if ( QString::compare(g_iofCorrection, "dn", Qt::CaseInsensitive) != 0 ) {
     /* Note - this radiance calibration scaling factor is applied to both radiance and iof
-     * 
+     *
      * Units of RADIANCE
      * equation:
      *     Rad(i)=image(DN/s) * C * S(i) where
-     *         C = radStd = 3.42.10^-3 
-     *         S(i) = iofScale, 
-     *             with S(v) = 1, 
+     *         C = radStd = 3.42.10^-3
+     *         S(i) = iofScale,
+     *             with S(v) = 1,
      *             S(zs)=3.286 (factor computed by Lucille Le Corre of PSI),
      *             and the remaining scale factors from table 9 of the Ishiguro et al. 2010 paper
-     */ 
-    g_calibrationScale = g_radStd * g_iofScale / g_exposureTime; 
+     */
+    g_calibrationScale = g_radStd * g_iofScale / g_exposureTime;
     g_units = "W / (m**2 micrometer sr)";
 
     if ( QString::compare(g_iofCorrection, "iof", Qt::CaseInsensitive) == 0 ) {
       /* Note: iof (i.e. reflectance) equation described below is just
        *       Ref(i) = Rad(i) * pi * d^2 /Fv
-       *       so this if-statement is nested 
+       *       so this if-statement is nested
        *
        * Units of I/F (reflectance)
        * equation:
-       *     Ref(v)=image(DN/s) * C * S(i) * pi * d^2/F(v) where 
+       *     Ref(v)=image(DN/s) * C * S(i) * pi * d^2/F(v) where
        *         C, S(i) are as described above,
        *         d is the solar distance from the label of the v filter image,
-       *         Fv = solarflux(v) = 1861.145142 is the solar flux 
+       *         Fv = solarflux(v) = 1861.145142 is the solar flux
        *             resampled to V filter bandpass with Quantum Efficiency
        */
-      g_calibrationScale = g_calibrationScale 
-                           * Isis::PI 
-                           * (g_solarDist * g_solarDist) 
+      g_calibrationScale = g_calibrationScale
+                           * Isis::PI
+                           * (g_solarDist * g_solarDist)
                            / g_solarFlux;
       g_units = "I over F";
     }
@@ -351,9 +359,9 @@ void IsisMain() {
     process.StartProcess(calibrate);
   }
   catch (IException &ie) {
-    throw IException(ie, 
-                     IException::Programmer, 
-                     "Radiometric calibration failed!", 
+    throw IException(ie,
+                     IException::Programmer,
+                     "Radiometric calibration failed!",
                      _FILEINFO_);
   }
 
@@ -391,8 +399,8 @@ void IsisMain() {
   calibrationLog.addKeyword(PvlKeyword("IOFFactor", toString(g_calibrationScale, 16)));
   calibrationLog.addKeyword(PvlKeyword("Units", g_units));
 
-#if 0 
-// PSF correction is currently not working and has been removed as an option. 
+#if 0
+// PSF correction is currently not working and has been removed as an option.
   // This section will apply the PSF correction
   if ( g_applyPSF ) {
     //PSF correction
@@ -408,9 +416,9 @@ void IsisMain() {
 
 
     processDiffusionModel.SetInputCube(outputCube);
-    processDiffusionModel.SetOutputCube(psfModel.name(), attOutput, 
-                                        outputCube->sampleCount(), 
-                                        outputCube->lineCount(), 
+    processDiffusionModel.SetOutputCube(psfModel.name(), attOutput,
+                                        outputCube->sampleCount(),
+                                        outputCube->lineCount(),
                                         outputCube->bandCount());
 
     processDiffusionModel.SetBoxcarSize(g_size, g_size);
@@ -428,9 +436,9 @@ void IsisMain() {
         outputCube->putGroup(calibrationLog);
         process.EndProcess();
         remove( psfModel.expanded().toLatin1().data() );
-        throw IException(ie, 
-                         IException::Programmer, 
-                         "Calculating the diffusion model failed!", 
+        throw IException(ie,
+                         IException::Programmer,
+                         "Calculating the diffusion model failed!",
                          _FILEINFO_);
       }
 
@@ -460,14 +468,14 @@ void IsisMain() {
         calibrationLog.addKeyword(PvlKeyword("PSF_Focused", toString(g_alpha, 6)));
 
         key = PvlKeyword("PSF_Sigma");
-        for (int i = 0 ; i < g_N ; i++ ) { 
-          key.addValue(toString(g_sigma[i])); 
+        for (int i = 0 ; i < g_N ; i++ ) {
+          key.addValue(toString(g_sigma[i]));
         }
         calibrationLog.addKeyword(key);
 
         key = PvlKeyword("PSF_Diffuse");
-        for (int i = 0 ; i < g_N ; i++ ) { 
-          key.addValue(toString(g_A[i])); 
+        for (int i = 0 ; i < g_N ; i++ ) {
+          key.addValue(toString(g_A[i]));
         }
 
       }
@@ -477,19 +485,19 @@ void IsisMain() {
         outputCube->putGroup(calibrationLog);
         process.EndProcess();
         remove( psfModel.expanded().toLatin1().data() );
-        throw IException(ie, 
-                         IException::Programmer, 
-                         "Applying the PSF correction failed!", 
+        throw IException(ie,
+                         IException::Programmer,
+                         "Applying the PSF correction failed!",
                          _FILEINFO_);
 
-      }  
-      
+      }
+
       processPSFCorrection.EndProcess();
 
-      // Remove the PSF file  
+      // Remove the PSF file
       remove( psfModel.expanded().toLatin1().data() );
   }
-#endif 
+#endif
 
   // Write Calibration group to output file
   outputCube->putGroup(calibrationLog);
@@ -530,7 +538,7 @@ FileName determineFlatFieldFile(const QString &filter, const bool nullPolarPix)
 
 
 #if 0
-// PSF correction is currently not working and has been removed as an option. 
+// PSF correction is currently not working and has been removed as an option.
 /**
  * @brief This function moves the PSF kernel through each pixel of the input cube and approximates
  * the amount of light diffusion produced by that pixel.
@@ -585,7 +593,7 @@ void psfCorrection(vector<Buffer *> &in, vector<Buffer *> &out) {
   }
 
 }
-#endif 
+#endif
 
 
 /**
@@ -613,7 +621,7 @@ QString loadCalibrationVariables(const QString &config)  {
   PvlGroup &solarFluxGroup = g_configFile.findGroup("SolarFlux");
 
 #if 0
-// PSF correction is currently not working and has been removed as an option. 
+// PSF correction is currently not working and has been removed as an option.
 //  PvlGroup &psfDiffuse = g_configFile.findGroup("PSFDiffuse");
 //  PvlGroup &psfFocused = g_configFile.findGroup("PSFFocused");
 #endif
@@ -663,15 +671,15 @@ QString loadCalibrationVariables(const QString &config)  {
 
   loadNaifTiming();  // Ensure the proper kernels are loaded
 
-  scs2e_c(g_hayabusaNaifCode, g_startTime.toLatin1().data(), &obsStartTime);  
+  scs2e_c(g_hayabusaNaifCode, g_startTime.toLatin1().data(), &obsStartTime);
   tsecs = obsStartTime - g_launchTime.Et();
   tdays = tsecs / 86400;
-  g_bias = g_b0 
-           + g_b1 * tdays 
+  g_bias = g_b0
+           + g_b1 * tdays
            + g_b2 * (tdays * tdays);
 
 #if 0
-// PSF correction is not working and is temporarily removed. 
+// PSF correction is not working and is temporarily removed.
   //g_bias = 0;
   //cout << "g_bias = "  << g_bias << endl;
 
@@ -821,4 +829,3 @@ void calibrate(vector<Buffer *>& in, vector<Buffer *>& out) {
   }
   return;
 }
-
diff --git a/isis/src/hayabusa/apps/hyb1pds4gen/main.cpp b/isis/src/hayabusa/apps/hyb1pds4gen/main.cpp
index 153cde8b039b06d704cfea95448f82b23dd92b08..ebca385c614b5b30adcc3a012300cce6fdb307c9 100644
--- a/isis/src/hayabusa/apps/hyb1pds4gen/main.cpp
+++ b/isis/src/hayabusa/apps/hyb1pds4gen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QDomDocument>
diff --git a/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.cpp b/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.cpp
index b790725f2c30667556f5ddd7be8f21bfa56c1f14..4db082cf872e6ae4ec0f54c7328df3f959afc5ef 100644
--- a/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.cpp
+++ b/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 6715 $
- * $Date: 2016-04-28 10:58:43 -0700 (Thu, 28 Apr 2016) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "NirsImportFits.h"
 
 #include <cctype>
diff --git a/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.h b/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.h
index 27226109cc361944bb6332e97ac100086231643a..bb05a38c31b823f0216d963af92d47c35fe3d864 100644
--- a/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.h
+++ b/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.h
@@ -1,26 +1,13 @@
 #ifndef NirsImportFits_h
 #define NirsImportFits_h
-/**
- * @file
- * $Revision: 5602 $
- * $Date: 2013-11-27 11:40:00 -0700 (Wed, 27 Nov 2013) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QString>
 
diff --git a/isis/src/hayabusa/apps/nirs2isis/main.cpp b/isis/src/hayabusa/apps/nirs2isis/main.cpp
index 805dc82762fe0f9891bfafdbda5eb5e22429b1d4..f5abbab7f7e01281bf68002015023bf79f633d36 100644
--- a/isis/src/hayabusa/apps/nirs2isis/main.cpp
+++ b/isis/src/hayabusa/apps/nirs2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Cube.h"
diff --git a/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.cpp b/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.cpp
index ab5d34c246294f01200fb818a9c024201b6fd709..ad25cfacda10b1d27aeb953442a371caee6e19a8 100644
--- a/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.cpp
+++ b/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "HayabusaAmicaCamera.h"
 
@@ -71,7 +59,7 @@ namespace Isis {
 
     // Setup focal plane map
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
-    
+
     // lines and samples added to the pvl in the order you
     // call getDouble()
     double bLines = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE");
@@ -91,7 +79,7 @@ namespace Isis {
     // line index is 1023.
     int actualFirstLine = 1023 - ((int) inst["LastLine"]);
 
-    //The detector line indexing is one-based. 
+    //The detector line indexing is one-based.
     detMap->SetStartingDetectorLine(actualFirstLine + 1);
 
     // Handle summing
@@ -113,9 +101,9 @@ namespace Isis {
   }
 
 
-  /** 
-   * Destructor 
-   */ 
+  /**
+   * Destructor
+   */
   HayabusaAmicaCamera::~HayabusaAmicaCamera() {
   }
 
@@ -154,8 +142,8 @@ namespace Isis {
    * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Frame ID
    */
-  int HayabusaAmicaCamera::CkFrameId() const { 
-    return (-130000); 
+  int HayabusaAmicaCamera::CkFrameId() const {
+    return (-130000);
   }
 
 
@@ -165,8 +153,8 @@ namespace Isis {
    * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Reference ID
    */
-  int HayabusaAmicaCamera::CkReferenceId() const { 
-    return (1); 
+  int HayabusaAmicaCamera::CkReferenceId() const {
+    return (1);
   }
 
 
@@ -176,8 +164,8 @@ namespace Isis {
    * @return @b int The appropriate instrument code for the Spacecraft
    *         Kernel Reference ID
    */
-  int HayabusaAmicaCamera::SpkReferenceId() const { 
-    return (1); 
+  int HayabusaAmicaCamera::SpkReferenceId() const {
+    return (1);
   }
 }
 
diff --git a/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.h b/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.h
index 6c67df6a2c5b8a3c6b5dadfc92e2e53696659bc8..33835f279534ecb7427cbff2227a9dc7d4b6e867 100644
--- a/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.h
+++ b/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.h
@@ -1,24 +1,13 @@
 #ifndef HayabusaAmicaCamera_h
 #define HayabusaAmicaCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -46,7 +35,7 @@ namespace Isis {
    *                           since Camera now handles this. References #2335.
    *   @history 2016-09-14 Kelvin Rodriguez - Enforced the order in which BORESIGHT_LINE and
    *                           BORESIGHT_SAMPLE are added to the PVL. Part of porting to
-   *                           OSX 10.11 
+   *                           OSX 10.11
    *   @history 2017-01-03 Jeannie Backer - Renamed from AmicaCamera to HayabusaAmicaCamera.
    *   @history 2017-01-03 Jeannie Backer - Fixed bug in constructor. When setting the detector
    *                           start line, the camera model was not taking into account the image
diff --git a/isis/src/hayabusa/objs/HayabusaAmicaCamera/unitTest.cpp b/isis/src/hayabusa/objs/HayabusaAmicaCamera/unitTest.cpp
index 14c551697f796d1779563d16ffa9986a013b61bc..5f0f9ebc2e8344cc3acc6f276307fe4971b0c5c5 100644
--- a/isis/src/hayabusa/objs/HayabusaAmicaCamera/unitTest.cpp
+++ b/isis/src/hayabusa/objs/HayabusaAmicaCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 
 #include <iomanip>
@@ -90,7 +79,7 @@ void testCamera(Cube &c, double knownLat, double knownLon) {
   qDebug() << "SPK Target ID    = " << cam->SpkTargetId();
   qDebug() << "SPK Reference ID = " << cam->SpkReferenceId();
   qDebug() << "";
-  
+
   // Test name methods
   qDebug() << "Spacecraft Name Long:  " << cam->spacecraftNameLong();
   qDebug() << "Spacecraft Name Short: " << cam->spacecraftNameShort();
@@ -98,7 +87,7 @@ void testCamera(Cube &c, double knownLat, double knownLon) {
   qDebug() << "Instrument Name Short: " << cam->instrumentNameShort();
   qDebug() << "";
 
-  // Test Shutter Open/Close 
+  // Test Shutter Open/Close
   const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
   double exposureDuration = ((double) inst["ExposureDuration"])/1000;
   QString stime = inst["StartTime"];
@@ -171,4 +160,3 @@ void testLineSamp(Camera *cam, double sample, double line) {
     qDebug() << "";
   }
 }
-
diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.cpp b/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.cpp
index 643f90f57d1e1b46a11e258fb194b375b8295f3b..aff2b188c26061984afdebdd7f62da18bc267843 100644
--- a/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.cpp
+++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "HayabusaNirsCamera.h"
 
@@ -69,7 +57,7 @@ namespace Isis {
 
     // Setup focal plane map
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
-    
+
     // lines and samples added to the pvl in the order you
     // call getDouble()
     double bLines = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE");
@@ -99,7 +87,7 @@ namespace Isis {
    * Destroys a HayabusaNirsCamera object
    */
   HayabusaNirsCamera::~HayabusaNirsCamera() {
-    
+
   }
 
 
@@ -133,12 +121,12 @@ namespace Isis {
 
   /**
    * @brief Returns the pixel ifov offsets from center of pixel.
-   * 
+   *
    * Returns the pixel ifov offset from the center of pixel for 8 points along
    * each edge of the fov. The Camera implementation only uses the four
    * corners.  Because the FOV of each pixel is so large, this uses 8 points on
    * each edge for a total of 28 points.
-   * 
+   *
    * @return @b QList<QPointF> A list of offset values to add to the look vector.
    */
    QList<QPointF> HayabusaNirsCamera::PixelIfovOffsets() {
diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.h b/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.h
index 2ccaf6cbb36e92691e645930e295714a6b828795..d774de8482fc560d2132d68a86511a4ad6f2d4f5 100644
--- a/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.h
+++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.h
@@ -1,24 +1,13 @@
 #ifndef HayabusaNirsCamera_h
 #define HayabusaNirsCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.cpp b/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.cpp
index a3f791fa4f734b3069b93dea34079f6d94c89541..404ead142e947038de9c9bd6aec90f7cb2d2a546 100644
--- a/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.cpp
+++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.cpp
@@ -1,32 +1,18 @@
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2009/04/08 02:32:55 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "NirsDetectorMap.h"
 
 namespace Isis {
 
   /**
    * Constructs a NirsDetectorMap object.
-   * 
+   *
    * @param exposureDuration The time for the observations.
    * @param parent The parent camera that uses the detector map.
    */
@@ -40,13 +26,13 @@ namespace Isis {
    * Destroys a NirsDetectorMap object.
    */
   NirsDetectorMap::~NirsDetectorMap() {
-    
+
   }
 
 
   /**
    * Sets the exposure duration
-   * 
+   *
    * @param exposureDuration The time for the observations.
    */
   void NirsDetectorMap::setExposureDuration(double exposureDuration) {
@@ -56,11 +42,11 @@ namespace Isis {
 
   /**
    * Returns the exposure duration for a given pixel.
-   * 
+   *
    * @param sample The sample location of the pixel.
    * @param line The line location of the pixel.
    * @param band The band location of the pixel.
-   * 
+   *
    * @return @b double The exposure duration for the pixel in seconds.
    */
   double NirsDetectorMap::exposureDuration(const double sample,
@@ -68,4 +54,4 @@ namespace Isis {
                                            const int band) const {
     return m_exposureDuration;
   }
-}
\ No newline at end of file
+}
diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.h b/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.h
index ed2aef2149d85b37aea6e8e5cac90b6aa9e17d47..970678acb41e7f4d0dd90f11db2e97d5776e1bac 100644
--- a/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.h
+++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.h
@@ -1,31 +1,20 @@
 #ifndef NirsDetectorMap_h
 #define NirsDetectorMap_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "CameraDetectorMap.h"
 
 namespace Isis {
   /**
    * @brief The detector map class for the Hayabusa NIRS camera.
-   * 
+   *
    * The detector map class to allow for exposure duration storage and retrieval
    * in the Hayabusa NIRS camera.
    *
@@ -52,4 +41,4 @@ namespace Isis {
       double m_exposureDuration; //!< The total time for the observation
   };
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/unitTest.cpp b/isis/src/hayabusa/objs/HayabusaNirsCamera/unitTest.cpp
index b894483e57f43282ede41b6c9d5c407feda7d19d..d2d08f77bec2ad02366632b0aa82169f1faab3ea 100644
--- a/isis/src/hayabusa/objs/HayabusaNirsCamera/unitTest.cpp
+++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -58,7 +47,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -128,4 +117,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp b/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp
index 85ca026ae01ae9409335226b29794c2493f43361..209c1fca7000b395f93a67076387271bd878d053 100644
--- a/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp
+++ b/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QString>
diff --git a/isis/src/hayabusa2/apps/hyb2onccal/main.cpp b/isis/src/hayabusa2/apps/hyb2onccal/main.cpp
index a46b7356aa8d4103ac9093a11e5cec04c7021754..1fe9c9a9010627b77e68436d3bd2c6ef4151454f 100644
--- a/isis/src/hayabusa2/apps/hyb2onccal/main.cpp
+++ b/isis/src/hayabusa2/apps/hyb2onccal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // $Id: hyb2onccal.cpp 6045 2015-02-07 02:06:59Z moses@GS.DOI.NET $
 #include "Isis.h"
 
diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.cpp b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.cpp
index 52b5570610dc14a7c4f63503c873739c9869c088..e390a89d18b85f29c6c3e66d39f704e049ed1045 100644
--- a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.cpp
+++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Hyb2OncCamera.h"
 
@@ -86,14 +74,14 @@ namespace Isis {
 
     // Setup focal plane map
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
-    
-    // BORESIGHT SAMPLE AND LINE still need to be added to the IAK 
+
+    // BORESIGHT SAMPLE AND LINE still need to be added to the IAK
     double bLines = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE");
     double bSamples = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_SAMPLE");
 
     focalMap->SetDetectorOrigin(bSamples, bLines);
-    
-    // Setup detector map (use default for now) 
+
+    // Setup detector map (use default for now)
     CameraDetectorMap *detMap = new CameraDetectorMap(this);
 
     // Handle summing
@@ -101,7 +89,7 @@ namespace Isis {
     detMap->SetDetectorLineSumming(binning);
     detMap->SetDetectorSampleSumming(binning);
 
-    // Setup distortion map (use default for now) 
+    // Setup distortion map (use default for now)
     CameraDistortionMap *distortionMap = new Hyb2OncDistortionMap(this);
     distortionMap->SetDistortion(naifIkCode());
 
@@ -115,9 +103,9 @@ namespace Isis {
   }
 
 
-  /** 
-   * Default Destructor 
-   */ 
+  /**
+   * Default Destructor
+   */
   Hyb2OncCamera::~Hyb2OncCamera() {
   }
 
@@ -152,8 +140,8 @@ namespace Isis {
    * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Frame ID
    */
-  int Hyb2OncCamera::CkFrameId() const { 
-    return (-37000); 
+  int Hyb2OncCamera::CkFrameId() const {
+    return (-37000);
   }
 
 
@@ -163,8 +151,8 @@ namespace Isis {
    * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Reference ID
    */
-  int Hyb2OncCamera::CkReferenceId() const { 
-    return (1); 
+  int Hyb2OncCamera::CkReferenceId() const {
+    return (1);
   }
 
 
@@ -174,8 +162,8 @@ namespace Isis {
    * @return @b int The appropriate instrument code for the Spacecraft
    *         Kernel Reference ID
    */
-  int Hyb2OncCamera::SpkReferenceId() const { 
-    return (1); 
+  int Hyb2OncCamera::SpkReferenceId() const {
+    return (1);
   }
 }
 
diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.h b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.h
index 610b0d544d686f08d117a8025bf4b0219a6fad27..dc74f2a33eb6e46e08c9f105fe25004d7a28db90 100644
--- a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.h
+++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.h
@@ -1,25 +1,13 @@
 #ifndef Hyb2OncCamera_h
 #define Hyb2OncCamera_h
 
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -34,7 +22,7 @@ namespace Isis {
    *
    * @internal
    *   @history 2017-07-07 Kristin Berry - Original version
-   *   
+   *
    */
   class Hyb2OncCamera : public FramingCamera {
     public:
diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.cpp b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.cpp
index 820a31f167296ffbcdd20c58ebf2b02ff103d84b..5633624c27952fa78e1dd7ab8de3122358a8be54 100644
--- a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.cpp
+++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.cpp
@@ -1,25 +1,10 @@
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2008/02/21 16:04:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QDebug>
 #include <QtGlobal>
@@ -28,21 +13,21 @@
 #include "Hyb2OncDistortionMap.h"
 
 namespace Isis {
-  /** 
+  /**
    * Hayabusa 2 ONC Camera distortion map constructor
    *
    * Create a camera distortion map for Hayabusa 2's ONC-T, ONC-W1, and
-   * ONC-W2. This class maps between distorted and undistorted 
-   * focal plane x/y's. The default mapping is the identity, that is, 
-   * the focal plane x/y and undistorted focal plane x/y will be 
-   * identical. 
+   * ONC-W2. This class maps between distorted and undistorted
+   * focal plane x/y's. The default mapping is the identity, that is,
+   * the focal plane x/y and undistorted focal plane x/y will be
+   * identical.
    *
    * @param parent        the parent camera that will use this distortion map
    * @param zDirection    the direction of the focal plane Z-axis
    *                      (either 1 or -1)
    *
    */
-  Hyb2OncDistortionMap::Hyb2OncDistortionMap(Camera *parent, double zDirection) 
+  Hyb2OncDistortionMap::Hyb2OncDistortionMap(Camera *parent, double zDirection)
       : CameraDistortionMap(parent, zDirection) {
   }
 
@@ -54,7 +39,7 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    * Compute undistorted focal plane x/y
    *
    * Compute undistorted focal plane x/y given a distorted focal plane x/y.
@@ -101,7 +86,7 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    * Compute distorted focal plane x/y
    *
    * Compute distorted focal plane x/y given an undistorted focal plane x/y.
@@ -140,14 +125,14 @@ namespace Isis {
       return true;
     }
     double rPrevious = r;
-    
+
     while (!converged && qAbs(r - rPrevious) > tolMilliMeters) {
       double r2 = r*r;
       double r4 = r2*r2;
       double dr = p_odk[0] + p_odk[1] * r2 + p_odk[2] * r4;
       rPrevious = r;
-      x = dr * x;  
-      y = dr * y;  
+      x = dr * x;
+      y = dr * y;
       r = x*x + y*y;
 
       iteration++;
@@ -165,4 +150,3 @@ namespace Isis {
   }
 
 }
-
diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.h b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.h
index 5f46598deeb35e387a182281c40aa8e5e6d5bcdb..1be581dcdcec0b0243b862bb1c882d9b0c0c6088 100644
--- a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.h
+++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.h
@@ -1,28 +1,14 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/02/21 16:04:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
 #ifndef Hyb2OncDistortionMap_h
 #define Hyb2OncDistortionMap_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CameraDistortionMap.h"
 
 namespace Isis {
diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/unitTest.cpp b/isis/src/hayabusa2/objs/Hyb2OncCamera/unitTest.cpp
index cf7f1dac4576f5d7723a8bd51702492477967681..f167ec883b70ce4b651f35090f6358b904c0b65b 100644
--- a/isis/src/hayabusa2/objs/Hyb2OncCamera/unitTest.cpp
+++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 
 #include <iomanip>
@@ -98,7 +87,7 @@ void testCamera(Cube &c, double knownLat, double knownLon) {
   qDebug() << "SPK Target ID    = " << cam->SpkTargetId();
   qDebug() << "SPK Reference ID = " << cam->SpkReferenceId();
   qDebug() << "";
-  
+
   // Test name methods
   qDebug() << "Spacecraft Name Long:  " << cam->spacecraftNameLong();
   qDebug() << "Spacecraft Name Short: " << cam->spacecraftNameShort();
@@ -106,7 +95,7 @@ void testCamera(Cube &c, double knownLat, double knownLon) {
   qDebug() << "Instrument Name Short: " << cam->instrumentNameShort();
   qDebug() << "";
 
-  // Test Shutter Open/Close 
+  // Test Shutter Open/Close
   const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
   double exposureDuration = ((double) inst["ExposureDuration"])/1000;
   QString stime = inst["StartTime"];
@@ -176,4 +165,3 @@ void testLineSamp(Camera *cam, double sample, double line) {
     qDebug() << "";
   }
 }
-
diff --git a/isis/src/juno/apps/junocam2isis/main.cpp b/isis/src/juno/apps/junocam2isis/main.cpp
index 9dee039103f8bfea47ff0c000e275237480b4cd4..566784d5b0df5069b1a617036d069eae77b39ffd 100644
--- a/isis/src/juno/apps/junocam2isis/main.cpp
+++ b/isis/src/juno/apps/junocam2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QFile>
diff --git a/isis/src/juno/objs/JunoCamera/JunoCamera.cpp b/isis/src/juno/objs/JunoCamera/JunoCamera.cpp
index f7c098c86486cc50eb85315b126d6b0cb2acda68..7e70f330542378dae66a621ab2408a454dca370a 100644
--- a/isis/src/juno/objs/JunoCamera/JunoCamera.cpp
+++ b/isis/src/juno/objs/JunoCamera/JunoCamera.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision:$
- * $Date:$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "JunoCamera.h"
 
 #include <QDebug>
diff --git a/isis/src/juno/objs/JunoCamera/JunoCamera.h b/isis/src/juno/objs/JunoCamera/JunoCamera.h
index a61108f25c785899452562f9d814fbe212dbca9a..45affce37e9c7d9cd4e774fa8d749e9920ff6fff 100644
--- a/isis/src/juno/objs/JunoCamera/JunoCamera.h
+++ b/isis/src/juno/objs/JunoCamera/JunoCamera.h
@@ -1,26 +1,14 @@
 #ifndef JunoCamera_h
 #define JunoCamera_h
-/**
- * @file
- * $Revision: $
- * $Date: $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "FramingCamera.h"
 
 #include <QString>
diff --git a/isis/src/juno/objs/JunoCamera/JunoDistortionMap.cpp b/isis/src/juno/objs/JunoCamera/JunoDistortionMap.cpp
index afd2eb09e4241b7be6b3fce738e0a5bc8cc90373..bbefd8d4ca1e93f41647a8f14e09243b2309a5ba 100644
--- a/isis/src/juno/objs/JunoCamera/JunoDistortionMap.cpp
+++ b/isis/src/juno/objs/JunoCamera/JunoDistortionMap.cpp
@@ -1,42 +1,28 @@
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2008/02/21 16:04:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IString.h"
 #include "JunoDistortionMap.h"
 
 namespace Isis {
-  /** 
-   * Juno JunoCam distortion map constructor 
-   *  
+  /**
+   * Juno JunoCam distortion map constructor
+   *
    * Create a distortion map for Juno's JunoCam camera. This class maps between distorted
    * and undistorted focal plane x/y's.  The default mapping is the
    * identity, that is, the focal plane x/y and undistorted focal plane
-   * x/y will be identical. The Z direction is set internally to positive for 
-   * JunoCam. 
+   * x/y will be identical. The Z direction is set internally to positive for
+   * JunoCam.
    *
    * @param parent        the parent camera that will use this distortion map
-   * 
+   *
    */
-  JunoDistortionMap::JunoDistortionMap(Camera *parent) 
+  JunoDistortionMap::JunoDistortionMap(Camera *parent)
       : CameraDistortionMap(parent, 1.0) {
   }
 
@@ -44,28 +30,28 @@ namespace Isis {
   /**
    * Destructor
    */
-  JunoDistortionMap::~JunoDistortionMap() { 
+  JunoDistortionMap::~JunoDistortionMap() {
   }
 
 
-  /** 
-   *  Load distortion coefficients for JunoCam 
+  /**
+   *  Load distortion coefficients for JunoCam
    *
    * This method loads the distortion coefficients from the instrument
    * kernel.  JunoCam's coefficients in the NAIF instrument kernel are
    * expected to be in the form of:
    *
    * @code
-   * INS-61500_DISTORTION_K0 = coefficient, index 0 
-   * INS-61500_DISTORTION_K1 = coefficient, index 1 
-   * INS-61500_DISTORTION_K2 = coefficient, index 2 
+   * INS-61500_DISTORTION_K0 = coefficient, index 0
+   * INS-61500_DISTORTION_K1 = coefficient, index 1
+   * INS-61500_DISTORTION_K2 = coefficient, index 2
    * @endcode
    *
    * These coefficients are designed for use with pixel coordinates, so they
    * are scaled based on the pixel pitch to operate in focal plane millimeters.
    * These coefficient will be used to convert from undistorted focal plane x,y
    * to distorted focal plane x,y as follows
-   * 
+   *
    * @code
    * r2 = r2 = (ux * ux) + (uy * uy);
    * dr = 1 + INS-61500_DISTORTION_K0 + INS-61500_DISTORTION_K1*r2 +INS-61500_DISTORTION_K2*r2*r2;
@@ -102,7 +88,7 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Compute distorted focal plane x/y
    *
    * Compute distorted focal plane x/y given an undistorted focal plane x/y.
@@ -117,7 +103,7 @@ namespace Isis {
    * @param uy undistorted focal plane y in millimeters
    *
    * @return @b if the conversion was successful
-   * 
+   *
    * @see SetDistortion
    */
   bool JunoDistortionMap::SetUndistortedFocalPlane(const double ux,
@@ -127,7 +113,7 @@ namespace Isis {
     p_undistortedFocalPlaneY = uy;
 
     // Compute the distance from the focal plane center and if we are
-    // close to the center then assume no distortion 
+    // close to the center then assume no distortion
     double r2 = (ux * ux) + (uy * uy);
     if (r2 <= 1.0E-6) {
       p_focalPlaneX = ux;
@@ -146,7 +132,7 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Compute undistorted focal plane x/y
    *
    * Compute undistorted focal plane x/y given a distorted focal plane x/y.
@@ -163,7 +149,7 @@ namespace Isis {
    * @see SetDistortion
    * @todo Generalize polynomial equation
    */
-  bool JunoDistortionMap::SetFocalPlane(double dx, 
+  bool JunoDistortionMap::SetFocalPlane(double dx,
                                         double dy) {
     p_focalPlaneX = dx;
     p_focalPlaneY = dy;
@@ -192,7 +178,7 @@ namespace Isis {
       dr = p_odk[0] + p_odk[1]*r2 + p_odk[2]*r2*r2;
       xDistortion = uxEstimate * dr;
       yDistortion = uyEstimate * dr;
-      uxEstimate = dx - xDistortion; 
+      uxEstimate = dx - xDistortion;
       uyEstimate = dy - yDistortion;
       i++;
       if (fabs(uxEstimate - uxPrev) < tolerance &&
diff --git a/isis/src/juno/objs/JunoCamera/JunoDistortionMap.h b/isis/src/juno/objs/JunoCamera/JunoDistortionMap.h
index 3c27a96feb7f7cf477f0320ba8740b7faae70bec..a14bfec4ac46e8b6f881ee12ed4a554f22f55806 100644
--- a/isis/src/juno/objs/JunoCamera/JunoDistortionMap.h
+++ b/isis/src/juno/objs/JunoCamera/JunoDistortionMap.h
@@ -1,33 +1,19 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/02/21 16:04:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
 #ifndef JunoDistortionMap_h
 #define JunoDistortionMap_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <vector>
 #include "CameraDistortionMap.h"
 
 namespace Isis {
-  /** Distort/undistort focal plane coordinates for Juno's JunoCam camera. 
+  /** Distort/undistort focal plane coordinates for Juno's JunoCam camera.
    *
    * Creates a map for adding/removing optical distortions
    * from the focal plane of a camera.
@@ -38,8 +24,8 @@ namespace Isis {
    *
    * @author 2017-08-04 Jeannie Backer and Kristin Berry
    *
-   * @internal 
-   *   @history 2017-08-04 Jeannie Backer and  Kristin Berry - Original version. 
+   * @internal
+   *   @history 2017-08-04 Jeannie Backer and  Kristin Berry - Original version.
    *
    */
   class JunoDistortionMap : public CameraDistortionMap {
diff --git a/isis/src/juno/objs/JunoCamera/unitTest.cpp b/isis/src/juno/objs/JunoCamera/unitTest.cpp
index f1c6bcf8861e7638a846337ec843d46c0ac64424..ca93b9227df64c163221f741ad90811188504c41 100644
--- a/isis/src/juno/objs/JunoCamera/unitTest.cpp
+++ b/isis/src/juno/objs/JunoCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 
 #include <iomanip>
@@ -39,7 +28,7 @@ void TestSampLine(Camera *cam, double samp, double line);
 
 /**
  * Unit test for Juno's JunoCam instrument.
- * 
+ *
  * @author 2017-09-11 Jesse Mapel
  * @internal
  *   @history 2017-09-11 Jesse Mapel - Original version.
@@ -70,7 +59,7 @@ int main(void) {
     qDebug() << "SPK Reference ID = " << cam->SpkReferenceId();
     qDebug() << "";
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = toDouble( inst["ExposureDuration"][0] );
     QString stime = inst["StartTime"];
@@ -108,7 +97,7 @@ int main(void) {
       qDebug() << "Latitude OK";
     }
     else {
-      qDebug() << qSetRealNumberPrecision(18) 
+      qDebug() << qSetRealNumberPrecision(18)
                << "Latitude off by: " << cam->UniversalLatitude() - knownLat;
     }
 
@@ -116,7 +105,7 @@ int main(void) {
       qDebug() << "Longitude OK";
     }
     else {
-      qDebug() << qSetRealNumberPrecision(18) 
+      qDebug() << qSetRealNumberPrecision(18)
                << "Longitude off by: " << cam->UniversalLongitude() - knownLon;
     }
   }
@@ -147,4 +136,3 @@ void TestSampLine(Camera *cam, double samp, double line) {
     qDebug() << "";
   }
 }
-
diff --git a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.cpp b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.cpp
index 9d4d60c0c958d4a8e5f0dc498f551f09f8590009..7fa954fbad59ee2e05172ef8d45a81fd5b4301a1 100644
--- a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.cpp
+++ b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "kaguyami2isis.h"
 
 #include <cstdio>
diff --git a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.h b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.h
index 6dcd366e9206d3170b761f5e3cac02a3356b3af6..e65a9248ec1a6966c2004a49dc1e9dc732de01bd 100644
--- a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.h
+++ b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.h
@@ -1,6 +1,14 @@
 #ifndef kaguyami2isis_h
 #define kaguyami2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 
 namespace Isis {
diff --git a/isis/src/kaguya/apps/kaguyami2isis/main.cpp b/isis/src/kaguya/apps/kaguyami2isis/main.cpp
index 0f2d424ad4d4b5fef713d97805b71c5a1c623171..88793ae9ddd3cf1b33670419911cddb068192a32 100644
--- a/isis/src/kaguya/apps/kaguyami2isis/main.cpp
+++ b/isis/src/kaguya/apps/kaguyami2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "kaguyami2isis.h"
diff --git a/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp b/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp
index edbbe6897ad6be2bbc34040c773684da71322b40..7fa27fab97c9af025ae1fa2dcc0a761931761bda 100644
--- a/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp
+++ b/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <bitset>
@@ -32,7 +40,7 @@ void IsisMain() {
     if (minobs < 1) {
       minobs = 1;
     }
-  } 
+  }
   if (ui.WasEntered("MAXOBS")) {
     QString keyval = ui.GetString("MAXOBS");
     maxobs = toInt(keyval);
@@ -91,7 +99,7 @@ void IsisMain() {
   } obuf;
 
   if (!lab.hasObject("SP_SPECTRUM_WAV") || !lab.hasObject("SP_SPECTRUM_QA") ||
-      !lab.hasObject("SP_SPECTRUM_RAD") || !(lab.hasObject("SP_SPECTRUM_REF") || 
+      !lab.hasObject("SP_SPECTRUM_RAD") || !(lab.hasObject("SP_SPECTRUM_REF") ||
       (lab.hasObject("SP_SPECTRUM_REF1") && lab.hasObject("SP_SPECTRUM_REF2")))) {
     QString msg = "Input file [" + inFile.expanded() + "] is not a valid ";
     msg += "Kaguya Spectral Profiler file";
@@ -252,13 +260,13 @@ void IsisMain() {
   }
 
   PvlObject refobj;
-  PvlObject refobj2; 
+  PvlObject refobj2;
   if (lab.hasKeyword("^SP_SPECTRUM_REF")) {
     refobj = lab.findObject("SP_SPECTRUM_REF");
-  } 
+  }
   else {
-    refobj = lab.findObject("SP_SPECTRUM_REF1"); 
-    refobj2 = lab.findObject("SP_SPECTRUM_REF2"); 
+    refobj = lab.findObject("SP_SPECTRUM_REF1");
+    refobj2 = lab.findObject("SP_SPECTRUM_REF2");
   }
 
   int reflines = toInt(refobj.findKeyword("LINES")[0]);
@@ -298,11 +306,11 @@ void IsisMain() {
       ref[j+i*296] = (float)obuf.iword * refscale + refoffset;
     }
   }
-  
+
   //import reflectance 2 if it exists
-  double *ref2 = NULL; 
+  double *ref2 = NULL;
   if (lab.hasKeyword("^SP_SPECTRUM_REF2")) {
-    int reflines2 = toInt(refobj2.findKeyword("LINES")[0]); 
+    int reflines2 = toInt(refobj2.findKeyword("LINES")[0]);
     int refsamps2 = toInt(refobj2.findKeyword("LINE_SAMPLES")[0]);
     QString reftype2 = refobj2.findKeyword("SAMPLE_TYPE");
     int refbits2 = toInt(refobj2.findKeyword("SAMPLE_BITS")[0]);
@@ -357,33 +365,33 @@ void IsisMain() {
   os << "Wavelength";
 
   //If we have a newer-format file with two Reflectances, output both
-  if (ref2 != NULL) { 
+  if (ref2 != NULL) {
     for (int i=minobs; i<=maxobs; i++) {
-      os << "\t" << "Raw" << i << "\t"<< "Rad" << i << "\t" <<"Ref1_" << i << "\t" << "Ref2_" << i 
+      os << "\t" << "Raw" << i << "\t"<< "Rad" << i << "\t" <<"Ref1_" << i << "\t" << "Ref2_" << i
           << "\t" << "QA" << i;
     }
-    os << endl; 
+    os << endl;
 
     for (int j = 0; j < 296; j++) {
       os << wavelength[j];
       for (int i=minobs-1; i<maxobs; i++) {
-        os << "\t" << raw[j+i*296] << "\t" << rad[j+i*296] << "\t" << ref[j+i*296] << "\t" 
+        os << "\t" << raw[j+i*296] << "\t" << rad[j+i*296] << "\t" << ref[j+i*296] << "\t"
             << ref2[j+i*296] << "\t" << (std::bitset<16>) qa[j+i*296];
       }
       os << endl;
      }
-     delete ref2; 
-  } 
+     delete ref2;
+  }
   else {
     for (int i=minobs; i<=maxobs; i++) {
       os << "\t" << "Raw" << i << "\t" << "Rad" << i << "\t" << "Ref" << i << "\t" << "QA" << i;
     }
-    os << endl;    
+    os << endl;
 
     for (int j = 0; j < 296; j++) {
       os << wavelength[j];
       for (int i=minobs-1; i<maxobs; i++) {
-        os << "\t" << raw[j+i*296] << "\t" << rad[j+i*296] << "\t" << ref[j+i*296] << "\t" 
+        os << "\t" << raw[j+i*296] << "\t" << rad[j+i*296] << "\t" << ref[j+i*296] << "\t"
             << (std::bitset<16>) qa[j+i*296];
       }
        os << endl;
diff --git a/isis/src/kaguya/apps/kaguyasp2isis/main.cpp b/isis/src/kaguya/apps/kaguyasp2isis/main.cpp
index b5bcd4fb8a44e7943dc7a8fdf2e1ef5dec9eabe9..1db52986fa862718f4f647721bea5afae5db23cc 100644
--- a/isis/src/kaguya/apps/kaguyasp2isis/main.cpp
+++ b/isis/src/kaguya/apps/kaguyasp2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <bitset>
@@ -32,7 +40,7 @@ void IsisMain() {
     if (minobs < 1) {
       minobs = 1;
     }
-  } 
+  }
   if (ui.WasEntered("MAXOBS")) {
     QString keyval = ui.GetString("MAXOBS");
     maxobs = toInt(keyval);
diff --git a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp
index 3d3cc89b4d472c7ade2ad0a2eaddc7cd232b45e9..66a979cfe16a8c301eac5466d7dcd51df96b686a 100644
--- a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp
+++ b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "kaguyatc2isis.h"
 
 #include <cstdio>
diff --git a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.h b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.h
index 9c2db22777eb02da43cfb1d127bd7595b9a128cb..07664c63e4adfd6e867b2a6856e57a1435610017 100644
--- a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.h
+++ b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.h
@@ -1,6 +1,14 @@
 #ifndef kaguyatc2isis_h
 #define kaguyatc2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 #include "Pvl.h"
 
diff --git a/isis/src/kaguya/apps/kaguyatc2isis/main.cpp b/isis/src/kaguya/apps/kaguyatc2isis/main.cpp
index c92d257f8f91e89e6bf63eb218565974fd3f51b4..0e318628bf34582d473f86f8a5611738c8cae27f 100644
--- a/isis/src/kaguya/apps/kaguyatc2isis/main.cpp
+++ b/isis/src/kaguya/apps/kaguyatc2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "kaguyatc2isis.h"
diff --git a/isis/src/kaguya/apps/mimap2isis/main.cpp b/isis/src/kaguya/apps/mimap2isis/main.cpp
index 77e9b28c3f4f836a99e58df2e26067a5a5caedcc..132056e03967b27d201085f2ed8b3b06753b4edd 100644
--- a/isis/src/kaguya/apps/mimap2isis/main.cpp
+++ b/isis/src/kaguya/apps/mimap2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "mimap2isis.h"
@@ -20,7 +28,7 @@ void IsisMain() {
     }
     throw;
   }
-  
+
   for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {
     Application::Log(*grpIt);
   }
diff --git a/isis/src/kaguya/apps/mimap2isis/mimap2isis.cpp b/isis/src/kaguya/apps/mimap2isis/mimap2isis.cpp
index 30994669274c3df8cae7f5b78267b83834fee8f8..eb7469349569664abd93909a07b93fb3d1f30ff3 100644
--- a/isis/src/kaguya/apps/mimap2isis/mimap2isis.cpp
+++ b/isis/src/kaguya/apps/mimap2isis/mimap2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "mimap2isis.h"
 
 #include "FileName.h"
@@ -111,4 +119,3 @@ namespace Isis {
   return;
   }
 }
-    
\ No newline at end of file
diff --git a/isis/src/kaguya/apps/mimap2isis/mimap2isis.h b/isis/src/kaguya/apps/mimap2isis/mimap2isis.h
index 6f498da1ff302e0ed6a1ee42b2f3156efde355c9..54fe0df1ae3e14ee5ea7507bf213a51a9be6e0ed 100644
--- a/isis/src/kaguya/apps/mimap2isis/mimap2isis.h
+++ b/isis/src/kaguya/apps/mimap2isis/mimap2isis.h
@@ -1,6 +1,14 @@
 #ifndef mimap2isis_h
 #define mimap2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Pvl.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp
index 62a3849d7cacdcbdd05b1a205bb8d80ca13bb25a..de4ba37cf95b97b9a773504f27d829088a58985a 100644
--- a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp
+++ b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "KaguyaMiCamera.h"
 
 #include <iomanip>
@@ -40,7 +29,7 @@ namespace Isis {
    *
    * @param lab Pvl Label to create the camera model from
    *
-   * @internal 
+   * @internal
    *   @history 2012-06-14 Orrin Thomas - original version
    */
   KaguyaMiCamera::KaguyaMiCamera(Cube &cube) : LineScanCamera(cube) {
@@ -65,7 +54,7 @@ namespace Isis {
       msg += " is not a supported instrument kernel code for Kaguya.";
       throw IException(IException::Programmer, msg, _FILEINFO_);
     }
-    
+
     NaifStatus::CheckErrors();
     // Set up the camera info from ik/iak kernels
 
@@ -73,7 +62,7 @@ namespace Isis {
     //Kaguya IK kernal uses INS-131???_PIXEL_SIZE instead of PIXEL_PITCH
     QString ikernKey = "INS" + toString(naifIkCode()) + "_PIXEL_SIZE";
     SetPixelPitch(getDouble(ikernKey));
- 
+
 
     // Get the start time from labels
     Pvl &lab = *cube.label();
diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.h b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.h
index 2de86700e445731497bd8dbf87db11b5c73dfae5..e2399e5e9c766390574dda4e3974f4949b1d53d2 100644
--- a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.h
+++ b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.h
@@ -1,24 +1,13 @@
 #ifndef KaguyaMiCamera_h
 #define KaguyaMiCamera_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -35,15 +24,15 @@ namespace Isis {
    *
    * @internal
    *   @history 2012-06-14 Orrin Thomas - original version
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
    *   @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Updated check for determining
-   *                           instrument names to check all valid MI camera naif codes. 
+   *                           instrument names to check all valid MI camera naif codes.
    *                           References #2335.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -56,24 +45,24 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-131000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.cpp b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.cpp
index 1ddfc019cdf344a8b3445db9ab2aabf414e5d77d..36e62e6583fb2babede6c3b921be1ea44eda7bfd 100644
--- a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.cpp
+++ b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <iostream>
 
@@ -45,13 +34,13 @@ namespace Isis {
   }
 
   /**
-   * @param naifIkCode 
+   * @param naifIkCode
    */
   void KaguyaMiCameraDistortionMap::SetDistortion(const int naifIkCode) {
     //determine if this is the VIS or the NIR sensor, by loooking at the pixel pitch
     if (p_camera->PixelPitch() == 0.013) m_numDistCoef = 3;  //VIS camera has 3 distortion coefs
     else                       m_numDistCoef = 4;  //NIR camera has 4 distortion coefs
-    
+
     //read the distortion coefs from the NAIF Kernels
     QString naifXKey = "INS" + toString(naifIkCode) + "_DISTORTION_COEF_X";
     QString naifYKey = "INS" + toString(naifIkCode) + "_DISTORTION_COEF_Y";
@@ -80,7 +69,7 @@ namespace Isis {
     p_focalPlaneX = dx;
     p_focalPlaneY = dy;
     //cout << "focal plane: " << dx << " " << dy << "\n";
-    //NOTE: the IK/FK kernel does not include the " + dx" as I do below.  They also define the 
+    //NOTE: the IK/FK kernel does not include the " + dx" as I do below.  They also define the
     // radial distance only in terms of Y.  Erroneously (I believe) they use only the
     // DISTORTION_COEF_X's in their model definition.  Finally, they provide different distortion
     // coefficients for each line of the CCD--despite them going throught the same optical path.
@@ -93,9 +82,9 @@ namespace Isis {
     // small adjustmenst being provided by the distortion model are only relevant as the offsets (x)
     // approach zero.
     if (m_numDistCoef == 3) {  //VIS camera
-      p_undistortedFocalPlaneX = 
+      p_undistortedFocalPlaneX =
         m_boreX + m_distCoefX[0] + dy*(m_distCoefX[1] + dy*m_distCoefX[2]) + dx;
-      p_undistortedFocalPlaneY = 
+      p_undistortedFocalPlaneY =
         m_boreY + m_distCoefY[0] + dy*(m_distCoefY[1] + dy*m_distCoefY[2]) + dy;
     }
     else {  //NIR camera
@@ -128,7 +117,7 @@ namespace Isis {
     if (m_numDistCoef == 3) {  //quadratic distortion model
       //use the quadratic equation to find the distorted Y value
       double A,B,C;  //coefficients of the quadric equation
-      
+
       A = m_distCoefY[2];
       B = 1.0 + m_distCoefY[1];
       C = m_distCoefY[0] +m_boreY - uy;
@@ -142,7 +131,7 @@ namespace Isis {
         p_focalPlaneY = fabs(uy - roots[0]) < fabs(uy - roots[1]) ? roots[0] : roots[1];
 
       //now that we know the distortedY we can directly calculate the X
-      p_focalPlaneX = ux - 
+      p_focalPlaneX = ux -
         (m_boreX + m_distCoefX[0] + p_focalPlaneY*(m_distCoefX[1] + p_focalPlaneY*m_distCoefX[2]));
 
       return true;
@@ -168,17 +157,17 @@ namespace Isis {
           delta << fabs(roots[i]-uy);
 
         if ( roots.size() == 3) //three roots to choose among
-          p_focalPlaneY = delta[0] < delta[1] ? 
-                         (delta[0] < delta[2] ? roots[0]:roots[2]) : 
+          p_focalPlaneY = delta[0] < delta[1] ?
+                         (delta[0] < delta[2] ? roots[0]:roots[2]) :
                          (delta[1] < delta[2] ? roots[1]:roots[2]) ;
         else  //two roots to choose between
           p_focalPlaneY = delta[0] < delta[1] ? roots[0]:roots[1]  ;
       }
-     
+
       //now that we know the distortedY we can directly calculate the X
-      p_focalPlaneX = ux - (m_boreX +m_distCoefX[0] + 
-                      p_focalPlaneY*(m_distCoefX[1] + 
-                      p_focalPlaneY*(m_distCoefX[2] +  
+      p_focalPlaneX = ux - (m_boreX +m_distCoefX[0] +
+                      p_focalPlaneY*(m_distCoefX[1] +
+                      p_focalPlaneY*(m_distCoefX[2] +
                       p_focalPlaneY* m_distCoefX[3])));
       return true;
     }
diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.h b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.h
index c7700e10d55b71900daa2f88907e641896f1fbfe..1a7232b9d8b409c29ae1e3af694cb6cdf92db77b 100644
--- a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.h
+++ b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.h
@@ -1,24 +1,13 @@
 #ifndef KaguyaMiCameraDistortionMap_h
 #define KaguyaMiCameraDistortionMap_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 #include "CameraDistortionMap.h"
diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/unitTest.cpp b/isis/src/kaguya/objs/KaguyaMiCamera/unitTest.cpp
index f181e71dbb618f83d4aa50d52eac9cf47793a097..4e07e6ac29347c034f5c1eef75dd33a976023e19 100644
--- a/isis/src/kaguya/objs/KaguyaMiCamera/unitTest.cpp
+++ b/isis/src/kaguya/objs/KaguyaMiCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 
 #include "Camera.h"
@@ -44,15 +33,15 @@ int main(int argc, char *argv[]) {
     // These should be lat/lon at center of image. To obtain these numbers for a new cube/camera,
     // set both the known lat and known lon to zero and copy the unit test output "Latitude off by: "
     // and "Longitude off by: " values directly into these variables.
-    double knownLat[4] = { -12.0400820752276996, 47.7445483329470406, 
+    double knownLat[4] = { -12.0400820752276996, 47.7445483329470406,
                             60.8041933170744215, 60.1567063916710580};
-    double knownLon[4] = { 355.7272261079595523, 42.9611485167199660, 
+    double knownLon[4] = { 355.7272261079595523, 42.9611485167199660,
                            135.3886983694549713, 135.3809757236753057};
 
-    char files[4][1024] = { "$ISISTESTDATA/isis/src/kaguya/unitTestData/MI_VIS.cub", "$ISISTESTDATA/isis/src/kaguya/unitTestData/MI_NIR.cub", 
-                            "$ISISTESTDATA/isis/src/kaguya/unitTestData/MVA_2B2_01_01228N608E1354.cub", 
+    char files[4][1024] = { "$ISISTESTDATA/isis/src/kaguya/unitTestData/MI_VIS.cub", "$ISISTESTDATA/isis/src/kaguya/unitTestData/MI_NIR.cub",
+                            "$ISISTESTDATA/isis/src/kaguya/unitTestData/MVA_2B2_01_01228N608E1354.cub",
                             "$ISISTESTDATA/isis/src/kaguya/unitTestData/MNA_2B2_01_01228N602E1354.cub"};
- 
+
     for (unsigned int i = 0; i < sizeof(knownLat) / sizeof(double); i++) {
       Cube c(files[i], "r");
       Camera *cam = CameraFactory::Create(c);
@@ -60,14 +49,14 @@ int main(int argc, char *argv[]) {
       cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
       cout.setf(std::ios::fixed);
       cout << setprecision(9);
-  
+
       // Test kernel IDs
       cout << "Kernel IDs: " << endl;
       cout << "CK Frame ID = " << cam->CkFrameId() << endl;
       cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
       cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
       cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-      
+
       // Test name methods
       cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
       cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -113,7 +102,7 @@ int main(int argc, char *argv[]) {
       }
       cout << endl << "--------------------------------------------" << endl;
     }
-    
+
     // Test exception: camera is not a supported Kaguya camera
     cout << endl << "Testing exceptions:" << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp
index a7ececb4cbae23b4c451893329aaa790194d8489..8aa594bf0473649b8eb32bfbdc8cbd765c35061e 100644
--- a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp
+++ b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "KaguyaTcCamera.h"
 #include "KaguyaTcCameraDistortionMap.h"
 
@@ -61,38 +50,38 @@ namespace Isis {
 
     // Setup detector map
     double lineRate = (double) inst["LineSamplingInterval"] / 1000.0;
-    
-    // Convert between parent image coordinates and detector coordinates (detector coordinate line, detector coordinate sample)   
+
+    // Convert between parent image coordinates and detector coordinates (detector coordinate line, detector coordinate sample)
     LineScanCameraDetectorMap *detectorMap = new LineScanCameraDetectorMap(this, time, lineRate);
 
     // Detetermine what to set the starting detector sample to, based on swath mode
     QString swathMode = inst["SwathModeId"];
 
-    double startingDetectorSample = 1; 
+    double startingDetectorSample = 1;
     if (swathMode.compare("FULL") == 0) {
-      startingDetectorSample = 1; 
+      startingDetectorSample = 1;
     }
     else if (swathMode.compare("NOMINAL") == 0) {
-      startingDetectorSample = 297; 
+      startingDetectorSample = 297;
     }
     else if (swathMode.compare("HALF") == 0) {
       startingDetectorSample = 1172;
     }
 
     detectorMap->SetStartingDetectorSample(startingDetectorSample);
-    
+
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
 
     // This sets the origin of the detector (not image samp,line). It is zero bassed.
     // The detector offsets are 0,0 because the borsight is in the center of the array
-    // The origin of the detector does not depend on swath mode. 
+    // The origin of the detector does not depend on swath mode.
     QString key;
     key = "INS" + toString(naifIkCode()) + "_BORESIGHT_SAMPLE";
     double sampleBoreSight = getDouble(key);
 
     key = "INS" + toString(naifIkCode()) + "_BORESIGHT_LINE";
     double lineBoreSight = getDouble(key);
-    focalMap->SetDetectorOrigin(sampleBoreSight, lineBoreSight); 
+    focalMap->SetDetectorOrigin(sampleBoreSight, lineBoreSight);
 
     // Setup distortion map
     new KaguyaTcCameraDistortionMap(this, naifIkCode());
diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.h b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.h
index 40e68e88c91c314faa86cb042244ae84b70a7c70..651d33b4c1b3b0820cfcd9cb7a248fe9a699f4fa 100644
--- a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.h
+++ b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.h
@@ -1,41 +1,30 @@
 #ifndef KaguyaTcCamera_h
 #define KaguyaTcCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
 namespace Isis {
   /**
-   * This is the camera model for the Kaguya Terrain Cameras TC1 and TC2 
+   * This is the camera model for the Kaguya Terrain Cameras TC1 and TC2
    *
    * @internal
    *   @history 2018-10-01 Adam Goins and Jeannie Backer - Original Version
-   *  
+   *
    *   @history 2019-04-26 Stuart Sides and Kristin Berry - Updates to Kaguya TC camera model
    *                        including updating to use LineScanCamera detector and ground maps, adding
    *                        detector offsets for swath modes, setting the focal plane map center to
    *                        the center of the detector, regardless of swath mode, and using the
    *                        spacecraft clock start count, rather than the StartTime for image timing.
    *                        See Git issue #3215 for more information.
-   *                             
+   *
    */
   class KaguyaTcCamera : public LineScanCamera {
     public:
diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.cpp b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.cpp
index 9cea6f3f5b27b975b32c679a38bb17db1e5839ad..2d567acf3d6705293791fa203e79245ee408f52b 100644
--- a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.cpp
+++ b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.cpp
@@ -1,25 +1,10 @@
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2008/02/21 16:04:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QDebug>
 #include <QtGlobal>
diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.h b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.h
index 07e673201a9740c8a7c673c943637ea0268775e7..9dfbe5481e64f7a1c7b59f238d5be6c3938fb72a 100644
--- a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.h
+++ b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.h
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/02/21 16:04:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #ifndef KaguyaTcCameraDistortionMap_h
 #define KaguyaTcCameraDistortionMap_h
 
diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/unitTest.cpp b/isis/src/kaguya/objs/KaguyaTcCamera/unitTest.cpp
index d66d625e7243047cdc09416e9e7cfc7b99e97212..96e31a11e131c291d3961c19bfc590375543bf1c 100644
--- a/isis/src/kaguya/objs/KaguyaTcCamera/unitTest.cpp
+++ b/isis/src/kaguya/objs/KaguyaTcCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 
 #include <iomanip>
diff --git a/isis/src/lo/apps/lo2isis/lo2isis.cpp b/isis/src/lo/apps/lo2isis/lo2isis.cpp
index 3ebf018f5e3914c68ee7e3b7c44d8d7c64cb376b..b47ce75c725e556c4be016776027f5b56039fb57 100644
--- a/isis/src/lo/apps/lo2isis/lo2isis.cpp
+++ b/isis/src/lo/apps/lo2isis/lo2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "lo2isis.h"
 #include "ProcessImportPds.h"
 #include "UserInterface.h"
diff --git a/isis/src/lo/apps/lo2isis/lo2isis.h b/isis/src/lo/apps/lo2isis/lo2isis.h
index 1bf030a3ec094bfb0fffb2b2f7eb73bb7f197884..730c585304a0df179d1fbe19859989d701f2f264 100644
--- a/isis/src/lo/apps/lo2isis/lo2isis.h
+++ b/isis/src/lo/apps/lo2isis/lo2isis.h
@@ -1,6 +1,14 @@
 #ifndef lo2isis_h
 #define lo2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Pvl.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/lo/apps/lo2isis/main.cpp b/isis/src/lo/apps/lo2isis/main.cpp
index 883c1d6b23b7bd5309f4ec72cae9c14b6c059b8c..891a173cb2a9fae9fe27ff48363a8e6e4e5b8f95 100644
--- a/isis/src/lo/apps/lo2isis/main.cpp
+++ b/isis/src/lo/apps/lo2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "lo2isis.h"
 #include "Application.h"
diff --git a/isis/src/lo/apps/lopdsgen/main.cpp b/isis/src/lo/apps/lopdsgen/main.cpp
index 52f68640225dbb3c3cec4a3f255edb4886fd4f3f..9a9a047261b7afaf236396b2a378a7724e58c710 100644
--- a/isis/src/lo/apps/lopdsgen/main.cpp
+++ b/isis/src/lo/apps/lopdsgen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "iTime.h"
diff --git a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp
index b056053729b5838885d10940df7963e7576a0804..d75987f28a3785f0ea6463abecf3d1dc32c02971 100644
--- a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp
+++ b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "LoCameraFiducialMap.h"
 
 #include "Affine.h"
diff --git a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h
index 43ade5f9ba54a91368365933b2d884e9c05069bd..3bfa0fbd57af8985665c9bc3074258f46b5506c4 100644
--- a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h
+++ b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h
@@ -1,24 +1,13 @@
 #ifndef LoCameraFiducialMap_h
 #define LoCameraFiducialMap_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "PvlGroup.h"
 
diff --git a/isis/src/lo/objs/LoCameraFiducialMap/unitTest.cpp b/isis/src/lo/objs/LoCameraFiducialMap/unitTest.cpp
index c73ef4275054102d88e49eca29ae2ba357fefdf3..d8fa72d8aec1aae55b3917b38f4f4282e31c4e63 100644
--- a/isis/src/lo/objs/LoCameraFiducialMap/unitTest.cpp
+++ b/isis/src/lo/objs/LoCameraFiducialMap/unitTest.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iomanip>
 #include <iostream>
@@ -248,4 +236,3 @@ int main(void) {
     e.print();
   }
 }
-
diff --git a/isis/src/lo/objs/LoHighCamera/LoHighCamera.cpp b/isis/src/lo/objs/LoHighCamera/LoHighCamera.cpp
index a2fa51ba1c1866785b642d79ba823db3aa9f7a23..1e7bd943b0c6c6eb3d1beeb6b692bc01efd42265 100644
--- a/isis/src/lo/objs/LoHighCamera/LoHighCamera.cpp
+++ b/isis/src/lo/objs/LoHighCamera/LoHighCamera.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2010/06/17 18:59:11 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "LoHighCamera.h"
 #include "LoHighDistortionMap.h"
 #include "LoCameraFiducialMap.h"
@@ -45,16 +31,16 @@ namespace Isis {
    * resolution images.
    *
    * @param lab Pvl label from a Lunar Orbiter High image.
-   * @internal 
+   * @internal
    *   @history 2011-05-03 Jeannie Walldren - Added NAIF error check.
    *
    */
   LoHighCamera::LoHighCamera(Cube &cube) : FramingCamera(cube) {
     NaifStatus::CheckErrors();
-    
+
     m_instrumentNameLong = "High Resolution Camera";
     m_instrumentNameShort = "High";
-    
+
     // LO3 High instrument kernel code = -533001
     if (naifIkCode() == -533001) {
       m_spacecraftNameLong = "Lunar Orbiter 3";
@@ -76,7 +62,7 @@ namespace Isis {
       msg += " is not a supported instrument kernel code for Lunar Orbiter.";
       throw IException(IException::Programmer, msg, _FILEINFO_);
     }
-    
+
     // Get the Instrument label information needed to define the camera for this frame
     Pvl &lab = *cube.label();
     PvlGroup inst = lab.findGroup("Instrument", Pvl::Traverse);
@@ -131,7 +117,7 @@ namespace Isis {
     NaifStatus::CheckErrors();
   }
 
-  
+
   /**
    * Returns the shutter open and close times. The user should pass in the
    * exposure duration in seconds and the StartTime keyword value, converted to
@@ -173,7 +159,7 @@ namespace Isis {
  * @param lab Cube labels
  *
  * @return Isis::Camera* LoHighCamera
- * @internal 
+ * @internal
  *   @history 2011-05-03 Jeannie Walldren - Added documentation.  Removed Lo
  *            namespace.
  */
diff --git a/isis/src/lo/objs/LoHighCamera/LoHighCamera.h b/isis/src/lo/objs/LoHighCamera/LoHighCamera.h
index 8df4445b921a29b3a5d322d8f1e2f80023f7fb50..53afe60566131899964c4b7f487c3f90f690d759 100644
--- a/isis/src/lo/objs/LoHighCamera/LoHighCamera.h
+++ b/isis/src/lo/objs/LoHighCamera/LoHighCamera.h
@@ -1,24 +1,13 @@
 #ifndef LoHighCamera_h
 #define LoHighCamera_h
-/**
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -52,15 +41,15 @@ namespace Isis {
    *                          Updated documentation. Removed Lo namespace wrap
    *                          inside Isis namespace wrap. Added Isis Disclaimer
    *                          to files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
    *   @history 2014-01-17 Kris Becker Corrected CkFrameId reference to
    *                          properly define LO 3,4,5 at runtime for generation
    *                          of CKs using ckwriter. References #1737.
    *   @history 2015-08-24 Ian Humphrey and Makayla Shepherd - Added new data members and methods
-   *                           to get spacecraft and instrument names. Extended unit test for 
+   *                           to get spacecraft and instrument names. Extended unit test for
    *                           testing name methods and added data for L03 and L05.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -69,28 +58,28 @@ namespace Isis {
       LoHighCamera(Cube &cube);
       //! Destroys the LoHighCamera Object
       ~LoHighCamera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (m_ckFrameId); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.cpp b/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.cpp
index fdbc9bd8fd525a82544882aed037215c8b18f362..9a950b789c90ed32d81f23b9bd0a84ba822c56be 100644
--- a/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.cpp
+++ b/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "LoHighDistortionMap.h"
 #include "IString.h"
 
diff --git a/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.h b/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.h
index f2e463126ab7e67bbca85043d264c5772a6583fc..4243881ef911ec41c7afca69bcefe63491606d5f 100644
--- a/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.h
+++ b/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.h
@@ -1,30 +1,19 @@
 #ifndef LoHighDistortionMap_h
 #define LoHighDistortionMap_h
 
-/**
- *  @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 #include "CameraDistortionMap.h"
 
 namespace Isis {
-  /** 
+  /**
    *  Distort/undistort focal plane coordinates
    *
    * Creates a map for adding/removing optical distortions
@@ -53,11 +42,11 @@ namespace Isis {
    *                          constructor was finished.
    *   @history 2011-05-03 Jeannie Walldren - Updated documentation. Removed Lo
    *                          namespace wrap.
-   *   @history 2012-07-06 Debbie A. Cook - Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook - Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
-   *   @history 2013-02-22 Debbie A. Cook - Updated SetUndistortedFocalPlane method to reflect 
-   *                          correction made to LookCtoFocalPlaneXY in CameraGroundMap.   The 
-   *                          adjustment for the z direction occurs in CameraGroundMap and is no 
+   *   @history 2013-02-22 Debbie A. Cook - Updated SetUndistortedFocalPlane method to reflect
+   *                          correction made to LookCtoFocalPlaneXY in CameraGroundMap.   The
+   *                          adjustment for the z direction occurs in CameraGroundMap and is no
    *                          needed here.  Fixes Mantis ticket #1524
    */
   class LoHighDistortionMap : public CameraDistortionMap {
diff --git a/isis/src/lo/objs/LoHighCamera/unitTest.cpp b/isis/src/lo/objs/LoHighCamera/unitTest.cpp
index e2c6db926c9c74e544c6eb912a478748e318322e..69bf3f3f67edeb6f7f71f43a88d1d0bb763c7b45 100644
--- a/isis/src/lo/objs/LoHighCamera/unitTest.cpp
+++ b/isis/src/lo/objs/LoHighCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -56,7 +45,7 @@ int main(void) {
     files.append("$ISISTESTDATA/isis/src/lo/unitTestData/3133_h1.cropped.cub"); // LO3 High
     files.append("$ISISTESTDATA/isis/src/lo/unitTestData/4164H_Full_mirror.cub"); // L04 High
     files.append("$ISISTESTDATA/isis/src/lo/unitTestData/5006_high_res_1.cropped.cub"); // L05 High
-    
+
     for (int i = 0; i < files.size(); i++) {
       Cube c(files[i], "r");
       LoHighCamera *cam = (LoHighCamera *) CameraFactory::Create(c);
@@ -64,73 +53,73 @@ int main(void) {
       cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
       cout.setf(std::ios::fixed);
       cout << setprecision(9);
-      
+
       // Test kernel IDs
       cout << "Kernel IDs: " << endl;
       cout << "CK Frame ID = " << cam->CkFrameId() << endl;
       cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
       cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
       cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-      
+
       // Test name methods
       cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
       cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
       cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
       cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
-      
-      // Test Shutter Open/Close 
-      
+
+      // Test Shutter Open/Close
+
       const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
       // approximate 1 tenth of a second since Lunar Orbiter did not provide
-      double exposureDuration = .1; 
+      double exposureDuration = .1;
       QString stime = inst["StartTime"];
       double et; // StartTime keyword is the center exposure time
       str2et_c(stime.toLatin1().data(), &et);
       pair <iTime, iTime> shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration);
       cout << "Shutter open = " << shuttertimes.first.Et() << endl;
       cout << "Shutter close = " << shuttertimes.second.Et() << endl << endl;
-      
-      
+
+
       // Test all four corners to make sure the conversions are right
       cout << "For upper left corner ..." << endl;
       TestLineSamp(cam, 1.0, 1.0);
-      
+
       cout << "For upper right corner ..." << endl;
       TestLineSamp(cam, cam->Samples(), 1.0);
-      
+
       cout << "For lower left corner ..." << endl;
       TestLineSamp(cam, 1.0, cam->Lines());
-      
+
       cout << "For lower right corner ..." << endl;
       TestLineSamp(cam, cam->Samples(), cam->Lines());
-      
+
       double samp = cam->Samples() / 2;
       double line = cam->Lines() / 2;
       cout << "For center pixel position ..." << endl;
-      
+
       if(!cam->SetImage(samp, line)) {
         cout << "ERROR" << endl;
         return 0;
       }
-      
+
       if(abs(cam->UniversalLatitude() - knownLat[i]) < 1E-10) {
         cout << "Latitude OK" << endl;
       }
       else {
-        cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat[i] 
+        cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat[i]
         << endl;
       }
-      
+
       if(abs(cam->UniversalLongitude() - knownLon[i]) < 1E-10) {
         cout << "Longitude OK" << endl;
       }
       else {
-        cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon[i] 
+        cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon[i]
         << endl;
       }
       cout << endl << "--------------------------------------------" << endl;
     }
-    
+
      // Test exception: camera is not a supported Kaguya camera
     cout << endl << "Testing exceptions:" << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
diff --git a/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.cpp b/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.cpp
index 03edf7545464e8137e3047c892ad2118f366b496..87c022a6115d5c346a1f650bd453409eb6334a69 100644
--- a/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.cpp
+++ b/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LoMediumCamera.h"
 #include "LoMediumDistortionMap.h"
@@ -51,10 +39,10 @@ namespace Isis {
    */
   LoMediumCamera::LoMediumCamera(Cube &cube) : FramingCamera(cube) {
     NaifStatus::CheckErrors();
-    
+
     m_instrumentNameLong = "Medium Resolution Camera";
     m_instrumentNameShort = "Medium";
-    
+
     // L03 Medium instrument kernel code = -533002
     if (naifIkCode() == -533002) {
       m_spacecraftNameLong = "Lunar Orbiter 3";
@@ -76,7 +64,7 @@ namespace Isis {
       msg += " is not a supported instrument kernel code for Lunar Orbiter.";
       throw IException(IException::Programmer, msg, _FILEINFO_);
     }
-    
+
     // Get the Instrument label information needed to define the camera for this frame
     Pvl &lab = *cube.label();
     PvlGroup inst = lab.findGroup("Instrument", Pvl::Traverse);
@@ -153,7 +141,7 @@ namespace Isis {
     NaifStatus::CheckErrors();
   }
 
-  
+
   /**
    * Returns the shutter open and close times. The user should pass in the
    * exposure duration in seconds and the StartTime keyword value, converted to
diff --git a/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.h b/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.h
index 35446dffb9748b950eb70b61e5f2d275dd427b3c..73cbec8af428d198204e90dcafd8f01942d6bd14 100644
--- a/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.h
+++ b/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.h
@@ -1,24 +1,13 @@
 #ifndef LoMediumCamera_h
 #define LoMediumCamera_h
-/**
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -26,8 +15,8 @@ namespace Isis {
   /**
    * @brief Defines the Lunar Orbiter Medium Resolution camera class
    *
-   * The LoMediumCamera class defines the Medium Resolution camera for the last 
-   * three Lunar Orbiter missions (3, 4, and 5). 
+   * The LoMediumCamera class defines the Medium Resolution camera for the last
+   * three Lunar Orbiter missions (3, 4, and 5).
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup LunarOrbiter
@@ -54,15 +43,15 @@ namespace Isis {
    *                           Updated documentation. Removed Lo namespace wrap
    *                           inside Isis namespace wrap. Added Isis Disclaimer
    *                           to files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2014-01-17 Kris Becker Corrected CkFrameId reference to
    *                           properly define LO 3,4,5 at runtime for generation
-   *                           of CKs using ckwriter. References #1737.  
+   *                           of CKs using ckwriter. References #1737.
    *   @history 2015-08-24 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test for these
    *                           methods and added data for LO4 and LO5.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -72,36 +61,36 @@ namespace Isis {
       //! Destroys the LoMediumCamera Object
       ~LoMediumCamera() {};
       /**
-       * This enum defines the types of focal plane maps supported in this 
-       * class. 
+       * This enum defines the types of focal plane maps supported in this
+       * class.
        */
       enum FocalPlaneMapType { Fiducial, //!< Fiducial Focal Plane Map
-                               Boresight,//!< Boresight Focal Plane Map 
+                               Boresight,//!< Boresight Focal Plane Map
                                None      //!< No Focal Plane Map
                              };
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (m_ckFrameId); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.cpp b/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.cpp
index 455d0036b7c00b00284b42f0201022c0891b2559..3eb0332db3254b76eb71313faa629df79e38b242 100644
--- a/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.cpp
+++ b/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.cpp
@@ -1,25 +1,10 @@
-/**
- * @file
- * $Revision: 1777 $
- * $Date: 2011-02-14 10:47:03 -0700 (Mon, 14 Feb 2011) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LoMediumDistortionMap.h"
 
diff --git a/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.h b/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.h
index 0bb5fa2bebda00511ee8248dbf4a73052e9b3945..00a478d537da715ce0c7a63f3d89f0290865f6da 100644
--- a/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.h
+++ b/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.h
@@ -1,30 +1,19 @@
 #ifndef LoMediumDistortionMap_h
 #define LoMediumDistortionMap_h
-/**
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 #include "CameraDistortionMap.h"
 
 namespace Isis {
-  /** 
+  /**
    *  Distort/undistort focal plane coordinates
    *
    * Creates a map for adding/removing optical distortions
@@ -63,11 +52,11 @@ namespace Isis {
    *                          defined to the image edges
    *   @history 2011-05-03 Jeannie Walldren - Updated documentation. Removed Lo
    *                          namespace wrap.
-   *   @history 2012-07-06 Debbie A. Cook - Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook - Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
-   *   @history 2013-02-22 Debbie A. Cook - Updated SetUndistortedFocalPlane method to reflect 
-   *                          correction made to LookCtoFocalPlaneXY in CameraGroundMap.   The 
-   *                          adjustment for the z direction occurs in CameraGroundMap and is no 
+   *   @history 2013-02-22 Debbie A. Cook - Updated SetUndistortedFocalPlane method to reflect
+   *                          correction made to LookCtoFocalPlaneXY in CameraGroundMap.   The
+   *                          adjustment for the z direction occurs in CameraGroundMap and is no
    *                          needed here.  Fixes Mantis ticket #1524
    */
   class LoMediumDistortionMap : public CameraDistortionMap {
diff --git a/isis/src/lo/objs/LoMediumCamera/unitTest.cpp b/isis/src/lo/objs/LoMediumCamera/unitTest.cpp
index 4e45cf771af034435aa692140584bbe08b404b32..4a63f87785b28474fcbc210235009b3490d4a085 100644
--- a/isis/src/lo/objs/LoMediumCamera/unitTest.cpp
+++ b/isis/src/lo/objs/LoMediumCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -51,12 +40,12 @@ int main(void) {
     // and "Longitude off by: " values directly into these variables.
     double knownLat[3] = { -2.430081939831881, -74.8893438078403477, 0.5289151367076288 };
     double knownLon[3] = { 13.55999413494297, 12.5149409284581896, 23.4631767915001923 };
-    
+
     QList<QString> files;
     files.append("$ISISTESTDATA/isis/src/lo/unitTestData/3083_med_tohi.cub");
     files.append("$ISISTESTDATA/isis/src/lo/unitTestData/4008_med_res.cropped.cub");
     files.append("$ISISTESTDATA/isis/src/lo/unitTestData/5072_med_res.cropped.cub");
-    
+
     for (int i = 0; i < files.size(); i++) {
       Cube c(files[i], "r");
       LoMediumCamera *cam = (LoMediumCamera *) CameraFactory::Create(c);
@@ -64,54 +53,54 @@ int main(void) {
       cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
       cout.setf(std::ios::fixed);
       cout << setprecision(9);
-      
+
       // Test kernel IDs
       cout << "Kernel IDs: " << endl;
       cout << "CK Frame ID = " << cam->CkFrameId() << endl;
       cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
       cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
       cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-      
+
       // Test name methods
       cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
       cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
       cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
       cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
-      
-      // Test Shutter Open/Close 
-      
+
+      // Test Shutter Open/Close
+
       const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
       // approximate 1 tenth of a second since Lunar Orbiter did not provide
-      double exposureDuration = .1; 
+      double exposureDuration = .1;
       QString stime = inst["StartTime"];
       double et; // StartTime keyword is the center exposure time
       str2et_c(stime.toLatin1().data(), &et);
       pair <iTime, iTime> shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration);
       cout << "Shutter open = " << shuttertimes.first.Et() << endl;
       cout << "Shutter close = " << shuttertimes.second.Et() << endl << endl;
-      
+
       // Test all four corners to make sure the conversions are right
       cout << "For upper left corner ..." << endl;
       TestLineSamp(cam, 1.0, 1.0);
-      
+
       cout << "For upper right corner ..." << endl;
       TestLineSamp(cam, cam->Samples(), 1.0);
-      
+
       cout << "For lower left corner ..." << endl;
       TestLineSamp(cam, 1.0, cam->Lines());
-      
+
       cout << "For lower right corner ..." << endl;
       TestLineSamp(cam, cam->Samples(), cam->Lines());
-      
+
       double samp = cam->Samples() / 2;
       double line = cam->Lines() / 2;
       cout << "For center pixel position ..." << endl;
-      
+
       if(!cam->SetImage(samp, line)) {
         cout << "ERROR" << endl;
         return 0;
       }
-      
+
       if(abs(cam->UniversalLatitude() - knownLat[i]) < 1E-10) {
         cout << "Latitude OK" << endl;
       }
@@ -119,7 +108,7 @@ int main(void) {
         cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat[i]
              << endl;
       }
-      
+
       if(abs(cam->UniversalLongitude() - knownLon[i]) < 1E-10) {
         cout << "Longitude OK" << endl;
       }
@@ -129,7 +118,7 @@ int main(void) {
       }
       cout << endl << "--------------------------------------------" << endl;
     }
-    
+
      // Test exception: camera is not a supported Kaguya camera
     cout << endl << "Testing exceptions:" << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
diff --git a/isis/src/lro/apps/lromakeflat/main.cpp b/isis/src/lro/apps/lromakeflat/main.cpp
index 16d622b076a25a00098b8e2daf6ca1fc0afc290f..29e57445fdc22ded326ff6c5fb4df1a39c2943a0 100644
--- a/isis/src/lro/apps/lromakeflat/main.cpp
+++ b/isis/src/lro/apps/lromakeflat/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 /**
  * @Brief This application creates three flatfield (Sensitivity Non-Uniformity Matrix) cubes used for calibration
  *
diff --git a/isis/src/lro/apps/lronac2isis/lronac2isis.cpp b/isis/src/lro/apps/lronac2isis/lronac2isis.cpp
index ac9e79fc1c3556810a2786819db47b77a5358690..536f4ce3dca08753a43978fdb89de561e31a0577 100644
--- a/isis/src/lro/apps/lronac2isis/lronac2isis.cpp
+++ b/isis/src/lro/apps/lronac2isis/lronac2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ProcessImportPds.h"
 #include "UserInterface.h"
 #include "FileName.h"
@@ -22,12 +30,12 @@ namespace Isis {
   static void ResetGlobals();
   static void Import(Buffer &buf);
   static void TranslateLrocNacLabels(FileName &labelFile, Cube *ocube);
-  
+
   // Global variables for processing functions
   Cube *g_ocube;
   std::vector< double> g_xterm, g_bterm, g_mterm;
   bool g_flip = false;
-  
+
   void lronac2isis(UserInterface &ui) {
     // Initialize variables
     ResetGlobals();
@@ -49,7 +57,7 @@ namespace Isis {
         msg += " Use pds2isis.";
         throw IException(IException::User, msg, _FILEINFO_);
       }
-      
+
       // Store the decompanding information
       PvlKeyword xtermKeyword = lab.findKeyword("LRO:XTERM"),
                  mtermKeyword = lab.findKeyword("LRO:MTERM"),
@@ -59,13 +67,13 @@ namespace Isis {
         QString msg = "The decompanding terms do not have the same dimensions";
         throw IException(IException::Io, msg, _FILEINFO_);
       }
-      
+
       for(int i = 0; i < xtermKeyword.size(); i++) {
         g_xterm.push_back(toDouble(xtermKeyword[i]));
         g_mterm.push_back(toDouble(mtermKeyword[i]));
         g_bterm.push_back(toDouble(btermKeyword[i]));
       }
-  
+
       double versionId = toDouble(lab.findKeyword("PRODUCT_VERSION_ID")[0].remove(QRegExp("^v")));
       if(lab.findKeyword("FRAME_ID")[0] == "RIGHT" && versionId < 1.30)
         g_flip = true;
@@ -78,21 +86,21 @@ namespace Isis {
       finalException.append(e);
       throw finalException;
     }
-  
+
     id = id.simplified().trimmed();
     if(id.mid(13, 3) != "EDR") {
       QString msg = "Input file [" + inFile.expanded() + "] does not appear to be "
                    + "in LROC-NAC EDR format. DATA_SET_ID is [" + id + "]";
       throw IException(IException::Io, msg, _FILEINFO_);
     }
-  
+
     //Process the file
     Pvl pdsLab;
     ProcessImportPds p;
     p.SetPdsFile(inFile.expanded(), "", pdsLab);
     // Set the output bit type to Real
     CubeAttributeOutput &outAtt = ui.GetOutputAttribute("TO");
-  
+
     g_ocube = new Cube();
     g_ocube->setByteOrder(outAtt.byteOrder());
     g_ocube->setFormat(outAtt.fileFormat());
@@ -104,13 +112,13 @@ namespace Isis {
     // Do 8 bit to 12 bit conversion
     // And if NAC-R, flip the frame
     p.StartProcess(Import);
-  
+
     // Then translate the labels
     TranslateLrocNacLabels(inFile, g_ocube);
     p.EndProcess();
 
     // Add History
-    if (iApp) { 
+    if (iApp) {
         History history("IsisCube");
         history.AddEntry();
         g_ocube->write(history);
@@ -122,7 +130,7 @@ namespace Isis {
     g_ocube->close();
     delete g_ocube;
   }
-  
+
   // The input buffer has a raw 16 bit buffer but the values are still 0 to 255.
   // See "Appendix B - NAC and WAC Companding Schemes" of the LROC_SOC_SPEC
   // document for reference.
@@ -131,24 +139,24 @@ namespace Isis {
     outLines.SetLine(in.Line(), in.Band());
     Buffer buf(in.SampleDimension(), in.LineDimension(), in.BandDimension(),
                g_ocube->pixelType());
-  
+
     // Do the decompanding
     for(int pixin = 0; pixin < in.size(); pixin++) {
-  
+
       // if pixin < xtermo0, then it is in "segment 0"
       if(in[pixin] < g_xterm[0])
         buf[pixin] = (int) in[pixin];
-  
+
       // otherwise, it is in segments 1 to 5
       else {
         unsigned int segment = 1;
         while(segment < g_xterm.size() && (in[pixin] - g_bterm[segment - 1]) / g_mterm[segment - 1] >= g_xterm[segment])
           segment++;
-  
+
         // Compute the upper and lower bin values
         double upper = (in[pixin] + 1 - g_bterm[segment - 1]) / g_mterm[segment - 1] - 1;
         double lower = (in[pixin] - g_bterm[segment - 1]) / g_mterm[segment - 1];
-  
+
         // Check if the bin is on the upper boundary of the last segment
         if(upper > MAX_INPUT_VALUE)
           upper = MAX_INPUT_VALUE;
@@ -156,17 +164,17 @@ namespace Isis {
           if((int)(g_bterm[segment] + g_mterm[segment]*upper) != in[pixin])
             upper = g_xterm[segment] - 1;
         }
-  
+
         // Check if it is on the lower boundary of a segment
         if(lower < g_xterm[segment-1])
           lower = g_xterm[segment-1];
-  
+
         // Output the middle bin value
         buf[pixin] = (upper + lower) / 2.0;
-  
+
       }
     }
-  
+
     // flip the NAC-R frame
     if(g_flip) {
       Buffer tmpbuf(buf);
@@ -176,39 +184,39 @@ namespace Isis {
     outLines.Copy(buf);
     g_ocube->write(outLines);
   }
-  
+
   //Function to translate the labels
   void TranslateLrocNacLabels(FileName &labelFile, Cube *ocube) {
-  
+
     //Pvl to store the labels
     Pvl outLabel;
     //Set up the directory where the translations are
     Pvl labelPvl(labelFile.expanded());
-  
+
     //Translate the Instrument group
     FileName transFile("$ISISROOT/appdata/translations/LroNacInstrument.trn");
     PvlToPvlTranslationManager instrumentXlator(labelPvl, transFile.expanded());
     instrumentXlator.Auto(outLabel);
-  
+
     //Translate the Archive group
     transFile = "$ISISROOT/appdata/translations/LroNacArchive.trn";
     PvlToPvlTranslationManager archiveXlater(labelPvl, transFile.expanded());
     archiveXlater.Auto(outLabel);
-  
+
     //Translate the BandBin group
     transFile = "$ISISROOT/appdata/translations/LroNacBandBin.trn";
     PvlToPvlTranslationManager bandBinXlater(labelPvl, transFile.expanded());
     bandBinXlater.Auto(outLabel);
-  
+
     Pvl lab(labelFile.expanded());
-  
+
     //Set up the Kernels group
     PvlGroup kern("Kernels");
     if(lab.findKeyword("FRAME_ID")[0] == "LEFT")
       kern += PvlKeyword("NaifFrameCode", "-85600");
     else
       kern += PvlKeyword("NaifFrameCode", "-85610");
-  
+
     PvlGroup inst = outLabel.findGroup("Instrument", Pvl::Traverse);
     if(lab.findKeyword("FRAME_ID")[0] == "LEFT") {
       inst.findKeyword("InstrumentId") = "NACL";
@@ -218,14 +226,14 @@ namespace Isis {
       inst.findKeyword("InstrumentId") = "NACR";
       inst.findKeyword("InstrumentName") = "LUNAR RECONNAISSANCE ORBITER NARROW ANGLE CAMERA RIGHT";
     }
-  
+
     //Add all groups to the output cube
     ocube->putGroup(inst);
     ocube->putGroup(outLabel.findGroup("Archive", Pvl::Traverse));
     ocube->putGroup(outLabel.findGroup("BandBin", Pvl::Traverse));
     ocube->putGroup(kern);
   }
-  
+
   void ResetGlobals() {
     g_ocube = NULL;
     g_xterm.clear();
diff --git a/isis/src/lro/apps/lronac2isis/lronac2isis.h b/isis/src/lro/apps/lronac2isis/lronac2isis.h
index 947423c1d943f79f475201856a1c40caa9ffc090..68ff06f6fa327f7e2ccbb36d59eb29b1f8632cf4 100644
--- a/isis/src/lro/apps/lronac2isis/lronac2isis.h
+++ b/isis/src/lro/apps/lronac2isis/lronac2isis.h
@@ -1,6 +1,14 @@
-#ifndef lronac2isis_h // Change this to your app name in all lower case suffixed with _h (e.g. campt_h, cam2map_h etc.)
+#ifndef lronac2isis_h 
 #define lronac2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "UserInterface.h"
 
@@ -9,4 +17,4 @@ namespace Isis{
   extern void lronac2isis(UserInterface &ui);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/isis/src/lro/apps/lronac2isis/main.cpp b/isis/src/lro/apps/lronac2isis/main.cpp
index b3613506671be79287c6c8ca23d0bb11e8d00ea5..64450bdeb20bf10c06a822d3019f45fee37681d7 100644
--- a/isis/src/lro/apps/lronac2isis/main.cpp
+++ b/isis/src/lro/apps/lronac2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
@@ -8,4 +16,4 @@ using namespace Isis;
 void IsisMain() {
   UserInterface &ui = Application::GetUserInterface();
   lronac2isis(ui);
-}
\ No newline at end of file
+}
diff --git a/isis/src/lro/apps/lronac2pds/lronac2pds.cpp b/isis/src/lro/apps/lronac2pds/lronac2pds.cpp
index 07ddac9b681884d231b389dd3b61f9d491ff6ed1..98322bb34e299b2f0bd2995f24f52b573c4dc104 100644
--- a/isis/src/lro/apps/lronac2pds/lronac2pds.cpp
+++ b/isis/src/lro/apps/lronac2pds/lronac2pds.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "lronac2pds.h"
 
 #include <sstream>
diff --git a/isis/src/lro/apps/lronac2pds/lronac2pds.h b/isis/src/lro/apps/lronac2pds/lronac2pds.h
index 7b8dadb117e9dab43706d5eed7bfb7154ed98d77..c64ba87da3ecbdb36ddfe2389952bd9c2ec09ed7 100644
--- a/isis/src/lro/apps/lronac2pds/lronac2pds.h
+++ b/isis/src/lro/apps/lronac2pds/lronac2pds.h
@@ -1,6 +1,14 @@
 #ifndef lronac2pds_h
 #define lronac2pds_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Pvl.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/lro/apps/lronac2pds/main.cpp b/isis/src/lro/apps/lronac2pds/main.cpp
index 99d8a850cd0d27f7f9c27009df880177a8e47495..f9627534649b16906aae89d8ca5ffec6d27da17d 100644
--- a/isis/src/lro/apps/lronac2pds/main.cpp
+++ b/isis/src/lro/apps/lronac2pds/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "lronac2pds.h"
diff --git a/isis/src/lro/apps/lronaccal/main.cpp b/isis/src/lro/apps/lronaccal/main.cpp
index 3048bf76d82b191d6ee4b86b638d4d553ae44ffb..64dd00e677f189e14fa4361af882b278a7e09c00 100644
--- a/isis/src/lro/apps/lronaccal/main.cpp
+++ b/isis/src/lro/apps/lronaccal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "SpecialPixel.h"
@@ -197,16 +205,16 @@ void IsisMain() {
 
     if(g_iof) {
       iTime startTime((QString) inst["StartTime"]);
-      
+
       try {
-        Camera *cam; 
+        Camera *cam;
         cam = iCube->camera();
         cam->setTime(startTime);
-        g_solarDistance = cam->sunToBodyDist() / KM_PER_AU; 
-        
+        g_solarDistance = cam->sunToBodyDist() / KM_PER_AU;
+
       }
       catch(IException &e) {
-        // Failed to instantiate a camera, try furnishing kernels directly 
+        // Failed to instantiate a camera, try furnishing kernels directly
         try {
 
           double etStart = startTime.Et();
diff --git a/isis/src/lro/apps/lronacecho/main.cpp b/isis/src/lro/apps/lronacecho/main.cpp
index 7402d7b1cf65c2dd9152576c0ef1ab4d5a7262d8..f9ca3b6cb0536a21e1d75e838762236a9c61d938 100644
--- a/isis/src/lro/apps/lronacecho/main.cpp
+++ b/isis/src/lro/apps/lronacecho/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "ProcessByLine.h"
@@ -68,7 +76,7 @@ void IsisMain() {
 }
 
 void correct(Buffer &in, Buffer &out) {
-  double delta = 0; //<! A delta value used for 'ramping up' the correction at the edge of the image  
+  double delta = 0; //<! A delta value used for 'ramping up' the correction at the edge of the image
 
   if (g_isLeft) {
     for(int i = 0; i < in.size(); i++) {
diff --git a/isis/src/lro/apps/lronacpho/LROCEmpirical.cpp b/isis/src/lro/apps/lronacpho/LROCEmpirical.cpp
index c8b7a5c46875247bf5af9f192a4fe05407cd0b9f..8e512f68a33fe60852b4e4db223dd5ab85dfc0a7 100644
--- a/isis/src/lro/apps/lronacpho/LROCEmpirical.cpp
+++ b/isis/src/lro/apps/lronacpho/LROCEmpirical.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <cstdlib>
 #include <iomanip>
@@ -19,7 +27,7 @@ namespace Isis {
 
  /**
   * Create an LROCEmpirical photometric object
-  * 
+  *
   * @author 2016-08-15 Victor Silva
   *
   * @internal
@@ -41,14 +49,14 @@ namespace Isis {
    * @brief Initialize class from input PVL and Cube files
    *
    * This method is typically called at the class instantiation
-   * time but is reentrant. It reads the parameter PVL file and 
+   * time but is reentrant. It reads the parameter PVL file and
    * extracts Photometric model and Normalization models from it.
    * The cube is needed to match all potential profiles for each
    * band.
    *
    * @param pvl Input PVL parameter files
    * @param cube Input cube file to correct
-   * 
+   *
    * @throws IException::User "Errors in the input PVL file."
    * @throws IException::User "Band with wavelength Center does not have
    *                           PhotometricModel Algorithm group/profile."
@@ -96,7 +104,7 @@ namespace Isis {
       }
       else { // Appropriate photometric parameters not found
         ostringstream mess;
-        mess << "Band [" << i + 1 << "] with wavelength Center = [" << center[i] << 
+        mess << "Band [" << i + 1 << "] with wavelength Center = [" << center[i] <<
         "] does not have PhotometricModel Algorithm group/profile";
         IException e(IException::User, mess.str(), _FILEINFO_);
         errs += e.toString() + "\n";
@@ -116,15 +124,15 @@ namespace Isis {
   /**
    * @brief Method to get photometric property given angles
    *
-   * This method computes photometric property at the given cube location after 
+   * This method computes photometric property at the given cube location after
    * proper parameter container is found for the specific band.
-   * 
+   *
    * @param i    Incidence angle in degrees
    * @param e    Emission angle in degrees
    * @param g    Phase angle in degrees
    * @param band cube band to be tested
    *
-   * 
+   *
    * @throws IException::Programmer "Provided band out of range."
    *
    * @return @b double The photometric property
@@ -150,7 +158,7 @@ namespace Isis {
   /**
    * @brief Performs actual photometric correction calculations
    *
-   * This routine computes photometric correction using parameters for the 
+   * This routine computes photometric correction using parameters for the
    * LROC Emperical equation.
    *
    * @param parms Container of band-specific exponential parameters
@@ -193,13 +201,13 @@ namespace Isis {
 
   /**
    * @brief Return parameters used for all bands
-   * 
+   *
    * Method creates keyword vector of band-specific parameters
    * used in the photometric correction.
    *
    * @param pvl Output PVL container for keywords written
    *
-   * @author 2016-08-15 Victor Silva 
+   * @author 2016-08-15 Victor Silva
    *
    * @internal
    *   @history 2016-08-15 Victor Silva - Adapted code from lrowacpho application
@@ -267,11 +275,11 @@ namespace Isis {
    *
    * This method determines the set of LROCEmpirical parameters to
    * use for a given wavelength. It iterates through all band profiles
-   * as read from the PVL file and computes the difference between 
-   * wavelength parameter and the BandBinCenter keyword. The absolute 
-   * value of this value is checke against the BandBinCenterTolerance 
-   * parameter and if it is less than or equal to it, a Parameter 
-   * container is returned. 
+   * as read from the PVL file and computes the difference between
+   * wavelength parameter and the BandBinCenter keyword. The absolute
+   * value of this value is checke against the BandBinCenterTolerance
+   * parameter and if it is less than or equal to it, a Parameter
+   * container is returned.
    *
    * @param wavelength The wavelength to find parameters for
    *
@@ -280,8 +288,8 @@ namespace Isis {
    *                                     found for the wavelength then a
    *                                     default parameters object is returned.
    *
-   * @author 2016-08-15 Victor Silva 
-   * 
+   * @author 2016-08-15 Victor Silva
+   *
    * @internal
    *   @history 2016-08-15 Victor Silva - Adapted from the lrowacpho application
    *                           written by Kris Becker.
diff --git a/isis/src/lro/apps/lronacpho/LROCEmpirical.h b/isis/src/lro/apps/lronacpho/LROCEmpirical.h
index 5ce915fb895988d12976828c6dfc3649b3a49f1c..5ace4c69f0b58165532064fe69b54150042378f5 100644
--- a/isis/src/lro/apps/lronacpho/LROCEmpirical.h
+++ b/isis/src/lro/apps/lronacpho/LROCEmpirical.h
@@ -1,6 +1,14 @@
 #ifndef LROCEmpirical_h
 #define LROCEmpirical_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include <iomanip>
 #include <sstream>
@@ -42,7 +50,7 @@ namespace Isis {
        * Container for band photometric correction parameters
        *
        * @author 2016-08-15 Victor Silva
-       * 
+       *
        * @internal
        *   @history 2016-08-05 - Code adapted from lrowacpho written by Kris Becker
        */
diff --git a/isis/src/lro/apps/lronacpho/main.cpp b/isis/src/lro/apps/lronacpho/main.cpp
index 68bd934630193d6a03d05c60cc1d137b507cb8cd..ed3e5d27e2831021633e77525f08c38d7bb16406 100644
--- a/isis/src/lro/apps/lronacpho/main.cpp
+++ b/isis/src/lro/apps/lronacpho/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <string>
@@ -23,14 +31,14 @@ void phoCalWithBackplane (std::vector<Isis::Buffer *> &in, std::vector<Isis::Buf
  *
  * @brief Photometric application for the LRO NAC cameras
  *
- * This application provides featurs that allow multiband cubes for LRO NAC cameras 
+ * This application provides featurs that allow multiband cubes for LRO NAC cameras
  *   to be photometrically corrected
- *   
- * @author 2016-09-16 Victor Silva   
- *      
+ *
+ * @author 2016-09-16 Victor Silva
+ *
  * @internal
  *   @history 2016-09-19 Victor silva - Adapted from lrowacpho written by Kris Becker
- * 
+ *
  */
 void IsisMain (){
   // Isis Processing by line
diff --git a/isis/src/lro/apps/lrowac2isis/main.cpp b/isis/src/lro/apps/lrowac2isis/main.cpp
index f687a8b86eb66dd757320969b1d51112fe324730..0fa3f8ad09e3461485947468885734db4040e3fa 100644
--- a/isis/src/lro/apps/lrowac2isis/main.cpp
+++ b/isis/src/lro/apps/lrowac2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
diff --git a/isis/src/lro/apps/lrowac2pds/main.cpp b/isis/src/lro/apps/lrowac2pds/main.cpp
index 5caa9b28ff756c3c7513a0956c5d3d477556de7a..7b06c7551f79bc98acd2bebef16d9e45f5927741 100644
--- a/isis/src/lro/apps/lrowac2pds/main.cpp
+++ b/isis/src/lro/apps/lrowac2pds/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include <cstdio>
 #include <QString>
@@ -474,4 +482,3 @@ void CopyData ( std::ifstream &fin, std::ofstream &fout ) {
         fout.write(line, fin.gcount());
     }
 }
-
diff --git a/isis/src/lro/apps/lrowaccal/main.cpp b/isis/src/lro/apps/lrowaccal/main.cpp
index d3407ba3a40ce541fe223ff97618e8d1cd7dab7b..fa31a5d07fb8fa58d84691daa7484ae4d6641dcf 100644
--- a/isis/src/lro/apps/lrowaccal/main.cpp
+++ b/isis/src/lro/apps/lrowaccal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <vector>
@@ -126,7 +134,7 @@ void IsisMain () {
   Isis::PvlGroup &bandBin = icube->label()->findGroup("BandBin", Pvl::Traverse);
   QString filter = (QString) bandBin["Center"][0];
   QString filterNum = (QString) bandBin["FilterNumber"][0];
-  //We have to pay special attention incase we are passed a 
+  //We have to pay special attention incase we are passed a
   //single band image that has been "exploded" from a multiband wac
   if (instModeId == "COLOR" && g_bands.size() == 1)
    g_bands[0] = (toInt(filterNum) -2);
@@ -259,7 +267,7 @@ void IsisMain () {
   PvlKeyword temperaturePvl("TemperatureFile");
   if (g_temprature) {
     if (tempFile.toLower() == "default" || tempFile.length() == 0)
-      tempFile = GetCalibrationDirectory("") + "WAC_TempratureConstants.????.pvl"; 
+      tempFile = GetCalibrationDirectory("") + "WAC_TempratureConstants.????.pvl";
 
     FileName tempFileName(tempFile);
     if (tempFileName.isVersioned())
@@ -518,15 +526,15 @@ void Calibrate ( Buffer &inCube, Buffer &outCube ) {
               //
               // Where:
               //  'a' and 'b' are band dependant constants read in via a pvl file
-              //  
+              //
               //  AND
-              //  
+              //
               // frameTemp: (Pre-Calculated as it is used in multiple places)
               //
               //    (WAC end temp - WAC start temp)
               //    -------------------------------   *   frame   +   WAC start temp
               //         (WAC num framelets)
-              // 
+              //
               //
               //
               if (correctBand != -1)
@@ -771,7 +779,7 @@ void GetMask(QString &fileString, double temp, Buffer* &data) {
  * LRO calibration directory
  *
  * @param calibrationType The type of calibration data
- * 
+ *
  * @return @b QString Path of the calibration directory
  *
  * @internal
diff --git a/isis/src/lro/apps/lrowacpho/Exponential.cpp b/isis/src/lro/apps/lrowacpho/Exponential.cpp
index 97c5a9632024d1c8438cd1c369f92ab1485d3a52..e6fa2fafa97320456ec1d0564fcba57fd6b72443 100644
--- a/isis/src/lro/apps/lrowacpho/Exponential.cpp
+++ b/isis/src/lro/apps/lrowacpho/Exponential.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision$
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <cstdlib>
 #include <iomanip>
diff --git a/isis/src/lro/apps/lrowacpho/Exponential.h b/isis/src/lro/apps/lrowacpho/Exponential.h
index 95148f0a9d3d47bb723fbb28c87656626048bc7d..865e68818fdc74afde99287897605d4b40d610b1 100644
--- a/isis/src/lro/apps/lrowacpho/Exponential.h
+++ b/isis/src/lro/apps/lrowacpho/Exponential.h
@@ -1,27 +1,13 @@
 #ifndef Exponential_h
 #define Exponential_h
-/**
- * @file
- * $Revision$
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iostream>
 #include <sstream>
diff --git a/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp b/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp
index a44dc219fb00f120a49d1522a52b6a73d0fc0ba6..e79260e75f5f940851f72d96f6d2aea1308fe1cf 100644
--- a/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp
+++ b/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision$
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <cstdlib>
 #include <iomanip>
diff --git a/isis/src/lro/apps/lrowacpho/HapkeExponential.h b/isis/src/lro/apps/lrowacpho/HapkeExponential.h
index 6a9fe46942355bb491ffc3958975d922d7d688ef..054b64c336fe56f8fa96d056bcf8db81450ad47b 100644
--- a/isis/src/lro/apps/lrowacpho/HapkeExponential.h
+++ b/isis/src/lro/apps/lrowacpho/HapkeExponential.h
@@ -1,27 +1,13 @@
 #ifndef HapkeExponential_h
 #define HapkeExponential_h
-/**
- * @file
- * $Revision$
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iostream>
 #include <sstream>
diff --git a/isis/src/lro/apps/lrowacpho/Hillier.cpp b/isis/src/lro/apps/lrowacpho/Hillier.cpp
index 0726d71328d051414ddb06d10d5488fa4b7ad23b..fc0246474d26878dde0a3b03bc56b82b6129f282 100644
--- a/isis/src/lro/apps/lrowacpho/Hillier.cpp
+++ b/isis/src/lro/apps/lrowacpho/Hillier.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision$
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <cstdlib>
 #include <iomanip>
diff --git a/isis/src/lro/apps/lrowacpho/Hillier.h b/isis/src/lro/apps/lrowacpho/Hillier.h
index fde0bdb18ed4bb78a7961f7f4b31201ea8f1392c..1a4748d3cf00f25064af468344c7e8e59380916a 100644
--- a/isis/src/lro/apps/lrowacpho/Hillier.h
+++ b/isis/src/lro/apps/lrowacpho/Hillier.h
@@ -1,27 +1,13 @@
 #ifndef Hillier_h
 #define Hillier_h
-/**
- * @file
- * $Revision$
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iostream>
 #include <sstream>
diff --git a/isis/src/lro/apps/lrowacpho/main.cpp b/isis/src/lro/apps/lrowacpho/main.cpp
index ac853d60564d1bb71bebf4c53ea7d7f32086617e..eef83ddd95c5f7c4379b45463b9c51eace172462 100644
--- a/isis/src/lro/apps/lrowacpho/main.cpp
+++ b/isis/src/lro/apps/lrowacpho/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // $Id$
 #include "Isis.h"
 
diff --git a/isis/src/lro/apps/mrf2isis/main.cpp b/isis/src/lro/apps/mrf2isis/main.cpp
index c6114b60b73ad0781dce51e4a478bca7a1ba54cf..057cab1e545656b2c4156963a9cbf1e592089ce7 100644
--- a/isis/src/lro/apps/mrf2isis/main.cpp
+++ b/isis/src/lro/apps/mrf2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
@@ -153,7 +161,7 @@ void IsisMain() {
     }
     outcube->putGroup(kerns);
   }
-  
+
   //  Check for and log any change from the default projection offsets and multipliers
   if (p.GetProjectionOffsetChange()) {
     PvlGroup results = p.GetProjectionOffsetGroup();
diff --git a/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.cpp b/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.cpp
index e7afc70449cb9467950dcc8bea4d151a50c511e1..5322fc9be3cd4c7b0407dfa0cabaf8f1c6b2bbbd 100644
--- a/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.cpp
+++ b/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.cpp
@@ -1,21 +1,11 @@
-/**
- *   Unless noted otherwise, the portions of Isis written by the
- *   USGS are public domain. See individual third-party library
- *   and package descriptions for intellectual property
- *   information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include <sstream>
 #include <cmath>
diff --git a/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.h b/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.h
index ec6efad39aeee4e4ab4084b526db5c20a94e3857..ab8e45e41724798f3eca6084b3cada6c1f4f9e89 100644
--- a/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.h
+++ b/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.h
@@ -1,24 +1,13 @@
 #ifndef processexportminirflropds_h
 #define processexportminirflropds_h
 
-/**
- *   Unless noted otherwise, the portions of Isis written by the
- *   USGS are public domain. See individual third-party library
- *   and package descriptions for intellectual property
- *   information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "ProcessExportPds.h"
 
diff --git a/isis/src/lro/apps/mrf2pds/main.cpp b/isis/src/lro/apps/mrf2pds/main.cpp
index bcfb0587cd29eacf74cd23d7baffa342aec23d4d..f7ab8a4d2dcd48416cb9af6183ed385d97fe13c6 100644
--- a/isis/src/lro/apps/mrf2pds/main.cpp
+++ b/isis/src/lro/apps/mrf2pds/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "UserInterface.h"
 #include "FileName.h"
diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.cpp b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.cpp
index 795e7cadf01628e689bb52a6db50b61c42db2be5..b3494d24d479881c4c7c7bfd862f931582241f98 100644
--- a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.cpp
+++ b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "LroNarrowAngleCamera.h"
 
 #include <iomanip>
@@ -38,7 +27,7 @@ namespace Isis {
    *
    * @param lab Pvl Label to create the camera model from
    *
-   * @internal 
+   * @internal
    *   @history 2011-05-03 Jeannie Walldren - Added NAIF error check.
    */
   LroNarrowAngleCamera::LroNarrowAngleCamera(Cube &cube) : LineScanCamera(cube) {
diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.h b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.h
index fe0a49c27a09d54f584fd29190678225c489a7b4..6ac883e8d5c9a4649f0e6adcae6d8ffaf4294a39 100644
--- a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.h
+++ b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.h
@@ -1,24 +1,13 @@
 #ifndef LroNarrowAngleCamera_h
 #define LroNarrowAngleCamera_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -26,8 +15,8 @@ namespace Isis {
   /**
    * @brief LRO Narrow Angle Camera Model
    *
-   * This is the camera model for the Lunar Reconnaissance Orbiter narrow angle 
-   * camera. 
+   * This is the camera model for the Lunar Reconnaissance Orbiter narrow angle
+   * camera.
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup LunarReconnaissanceOrbiter
@@ -45,7 +34,7 @@ namespace Isis {
    *   @history 2015-08-14 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           added methods and added test data for LRO NACL.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -58,24 +47,24 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-85000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.cpp b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.cpp
index 25213ec27340389235bc0879be398b79e1bc6a45..d27e4671f4649f824ec7fe2fa7aaa11c84e3067c 100644
--- a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.cpp
+++ b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 
 #include "IString.h"
@@ -39,7 +28,7 @@ namespace Isis {
   }
 
   /**
-   * @param naifIkCode 
+   * @param naifIkCode
    */
   void LroNarrowAngleDistortionMap::SetDistortion(const int naifIkCode) {
     QString odkkey = "INS" + toString(naifIkCode) + "_OD_K";
@@ -137,7 +126,7 @@ namespace Isis {
 
       yprevious = yt;
     }
-    
+
     if(bConverged) {
       p_focalPlaneX = p_undistortedFocalPlaneX;
       p_focalPlaneY = ydistorted;
diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.h b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.h
index 998c0eb96ff96c74ff0bac2c07d32d0f1de9c11e..cac74319a1934f22d05cc0bb61d26d6590d1a2b7 100644
--- a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.h
+++ b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.h
@@ -1,31 +1,20 @@
 #ifndef LroNarrowAngleDistortionMap_h
 #define LroNarrowAngleDistortionMap_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 #include "CameraDistortionMap.h"
 
 namespace Isis {
 
-  /** 
+  /**
    *  Distort/undistort focal plane coordinates
    *
    * Creates a map for adding/removing optical distortions
@@ -40,14 +29,14 @@ namespace Isis {
    * @internal
    *   @history 2010-05-10 Ken Edmundson - Corrected computation of distorted
    *            and undistorted locations
-   *   @history 2010-08-21 Kris Becker - Changed the sign of the distortion 
+   *   @history 2010-08-21 Kris Becker - Changed the sign of the distortion
    *            parameter to match the calibration report.  The LRO/LROC IK
    *            lro_lroc_v14.ti and above contain the appropriate parameters
    *            to coincide with the code change made here.  IMPORTANT:  This
    *            results in Version = 2 of the LroNarrowAngleCamera as depicted
    *            in the Camera.plugin for both NAC-L and NAC-R.
    *   @history 2011-05-03 Jeannie Walldren - Removed Lro namespace wrap.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
    */
   class LroNarrowAngleDistortionMap : public CameraDistortionMap {
diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/unitTest.cpp b/isis/src/lro/objs/LroNarrowAngleCamera/unitTest.cpp
index 1eaecbd66fd3f275a9a307fb33a4b22fa10011de..d59ce9b3dc8bc1cccc6760900502cf3ed9fa4858 100644
--- a/isis/src/lro/objs/LroNarrowAngleCamera/unitTest.cpp
+++ b/isis/src/lro/objs/LroNarrowAngleCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -50,60 +39,60 @@ int main(void) {
     double knownLon = 353.9497987082821737;
     Cube c("$ISISTESTDATA/isis/src/lro/unitTestData/M111607830RE_crop.cub", "r");
     Camera *cam = CameraFactory::Create(c);
-    
+
     cout << "FileName: " << FileName(c.fileName()).name() << endl;
     cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
     cout.setf(std::ios::fixed);
     cout << setprecision(9);
-    
+
     // Test kernel IDs
     cout << "Kernel IDs: " << endl;
     cout << "CK Frame ID = " << cam->CkFrameId() << endl;
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test all four corners to make sure the conversions are right
     cout << "For upper left corner ..." << endl;
     TestLineSamp(cam, 1.0, 1.0);
-    
+
     cout << "For upper right corner ..." << endl;
     TestLineSamp(cam, cam->Samples(), 1.0);
-    
+
     cout << "For lower left corner ..." << endl;
     TestLineSamp(cam, 1.0, cam->Lines());
-    
+
     cout << "For lower right corner ..." << endl;
     TestLineSamp(cam, cam->Samples(), cam->Lines());
-    
+
     double samp = cam->Samples() / 2;
     double line = cam->Lines() / 2;
     cout << "For center pixel position ..." << endl;
-    
+
     if(!cam->SetImage(samp, line)) {
       cout << "ERROR" << endl;
       return 0;
     }
-    
+
     if(abs(cam->UniversalLatitude() - knownLat) < 1E-10) {
       cout << "Latitude OK" << endl;
     }
     else {
       cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat << endl;
     }
-    
+
     if(abs(cam->UniversalLongitude() - knownLon) < 1E-10) {
       cout << "Longitude OK" << endl;
     }
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
-    }    
+    }
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     QStringList files;
     files.append("$ISISTESTDATA/isis/src/lro/unitTestData/M111607830RE_crop.cub");
     files.append("$ISISTESTDATA/isis/src/lro/unitTestData/M1153718003LE.reduced.cub");
-    
+
     for (int i = 0; i < files.size(); i++) {
       Cube n(files[i], "r");
       Camera *nCam = CameraFactory::Create(n);
@@ -112,7 +101,7 @@ int main(void) {
       cout << "Instrument Name Long: " << nCam->instrumentNameLong() << endl;
       cout << "Instrument Name Short: " << nCam->instrumentNameShort() << endl << endl;
     }
-    
+
     // Test exception: camera is not a supported Kaguya camera
     cout << endl << "Testing exceptions:" << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
@@ -143,4 +132,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.cpp b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.cpp
index 7abac288b2e68dcc390f3a2746e2cccaec4d45cf..af580bf7ae5fdf46542c8b5178c48cb716141b87 100644
--- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.cpp
+++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LroWideAngleCamera.h"
 #include "LroWideAngleCameraFocalPlaneMap.h"
@@ -54,10 +42,10 @@ namespace Isis {
     PushFrameCamera(cube) {
 
     NaifStatus::CheckErrors();
-    
+
     m_spacecraftNameLong = "Lunar Reconnaissance Orbiter";
     m_spacecraftNameShort = "LRO";
-    
+
     // Set up the camera characteristics
     instrumentRotation()->SetFrame(naifIkCode());
     SetFocalLength();
@@ -263,7 +251,7 @@ namespace Isis {
 
     LroWideAngleCameraFocalPlaneMap *fplane = (LroWideAngleCameraFocalPlaneMap *) FocalPlaneMap();
     fplane->setBand(vband);
-    fplane->SetDetectorOrigin(p_boreSightSample[vband-1] + 1.0, 
+    fplane->SetDetectorOrigin(p_boreSightSample[vband-1] + 1.0,
                               p_boreSightLine[vband-1]   + 1.0);
 
     LroWideAngleCameraDistortionMap *distort = (LroWideAngleCameraDistortionMap *) DistortionMap();
@@ -330,8 +318,8 @@ namespace Isis {
 
   /**
    * CK frame ID -  - Instrument Code from spacit run on CK
-   *  
-   * @return @b int The appropriate instrument code for the "Camera-matrix" 
+   *
+   * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Frame ID
    */
   int LroWideAngleCamera::CkFrameId() const {
@@ -340,9 +328,9 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    * CK Reference ID - J2000
-   * 
+   *
    * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Reference ID
    */
@@ -352,10 +340,10 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    *  SPK Reference ID - J2000
-   *  
-   * @return @b int The appropriate instrument code for the Spacecraft 
+   *
+   * @return @b int The appropriate instrument code for the Spacecraft
    *         Kernel Reference ID
    */
   int LroWideAngleCamera::SpkReferenceId() const {
diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.h b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.h
index f25693940d5eb73c112e8fdf7778d1b26b52d860..5253125e455aa4e419c6cd2df446ae7fe477eb47 100644
--- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.h
+++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.h
@@ -1,24 +1,13 @@
 #ifndef LroWideAngleCamera_h
 #define LroWideAngleCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "PushFrameCamera.h"
 
diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.cpp b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.cpp
index dcbf8061a7a38fd91c5006f75b5ef6e3d9e5e6af..ba1be82ce96ed10f984a4de88e9ad33ba07172bc 100644
--- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.cpp
+++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2010/05/12 23:28:12 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 
 #include <sstream>
@@ -44,32 +30,32 @@ namespace Isis {
    *                      (either 1 or -1)
    *
    */
-  LroWideAngleCameraDistortionMap::LroWideAngleCameraDistortionMap(Camera *parent, 
-                                                                   int naifIkCode) : 
+  LroWideAngleCameraDistortionMap::LroWideAngleCameraDistortionMap(Camera *parent,
+                                                                   int naifIkCode) :
                                                                    CameraDistortionMap(parent) {
     SetDistortion(naifIkCode);
   }
 
 
 /**
- * @brief Add an additional set of parameters for a given LROC/WAC filter 
- *  
- * This method will read the parameters for LROC/WAC filter as indicated by the 
- * IK code provided. It will create a vector of these parameters and append them 
- * to the band list. 
- *  
- * The filters added should correspond directly to the order in which the 
- * filters are physically stored in the ISIS cube (or the virtually selected 
- * bands). 
- * 
+ * @brief Add an additional set of parameters for a given LROC/WAC filter
+ *
+ * This method will read the parameters for LROC/WAC filter as indicated by the
+ * IK code provided. It will create a vector of these parameters and append them
+ * to the band list.
+ *
+ * The filters added should correspond directly to the order in which the
+ * filters are physically stored in the ISIS cube (or the virtually selected
+ * bands).
+ *
  * @author 2013-03-07 Kris Becker
- * 
+ *
  * @param naifIkCode NAIF IK code for the desired filter to add.
  */
   void LroWideAngleCameraDistortionMap::addFilter(int naifIkCode) {
     QString odkkey = "INS" + QString::number(naifIkCode) + "_OD_K";
-    
-    std::vector<double> v_odk; 
+
+    std::vector<double> v_odk;
     for(int i = 0; i < 3; i++) {
       v_odk.push_back(p_camera->getDouble(odkkey, i));
     }
@@ -79,15 +65,15 @@ namespace Isis {
 
 
 /**
- * @brief Implements band-dependant distortion parameters 
- *  
- * This method should be used to switch to another band's set of distortion 
- * parameters.  See the addFilter() method to add additional band parameters to 
- * this object. Note that the band number should correspond with the same order 
- * as they were added in the addFilter() method. 
- * 
+ * @brief Implements band-dependant distortion parameters
+ *
+ * This method should be used to switch to another band's set of distortion
+ * parameters.  See the addFilter() method to add additional band parameters to
+ * this object. Note that the band number should correspond with the same order
+ * as they were added in the addFilter() method.
+ *
  * @author 2013-03-07 Kris Becker
- * 
+ *
  * @param vband  Band number to select.  Range is 1 to Bands.
  */
   void LroWideAngleCameraDistortionMap::setBand(int vband) {
@@ -96,10 +82,10 @@ namespace Isis {
                      " Must be <= " + QString::number(m_odkFilters.size());
       throw IException(IException::Programmer, mess, _FILEINFO_);
     }
-     
+
     //  Install new parameters
     p_odk = m_odkFilters[vband-1];
-    
+
     return;
 
   }
@@ -127,7 +113,7 @@ namespace Isis {
     double rr = dx * dx + dy * dy;
 
     double dr = 1.0 + dk1 * rr + dk2 * rr * rr + dk3 * rr * rr * rr;
-    
+
     // This was in here when the model used to be dx/dr so that the model
     // would never divide by zero.
     if ( dr == 0.0 ) return false;
diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.h b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.h
index 8d21dda5c2eb06fd32e7df721a1ec060b2cfbc61..e053b162c2ca470757e5bdf2e7245bd2844c9290 100644
--- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.h
+++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.h
@@ -1,30 +1,19 @@
 #ifndef LroWideAngleCameraDistortionMap_h
 #define LroWideAngleCameraDistortionMap_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QVector>
 #include "CameraDistortionMap.h"
 
 namespace Isis {
-  /** 
+  /**
    *  Distort/undistort focal plane coordinates
    *
    * Creates a map for adding/removing optical distortions
@@ -46,7 +35,7 @@ namespace Isis {
    *            what is reported in the calibration document); removed the
    *            GuessDx method as it was not used; updated the UV boresight in
    *            the IK based upon analysis of the VIS and UV.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *            coding standards. References #972.
    *   @history 2011-08-30 Kris Becker - Implemented new decentering distortion
    *            model.  This becomes version 3 of the camera model
diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.cpp b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.cpp
index ef9c300a43e745420331df9196180c1a10f6b7d2..15e9ed93f15ef67c4e6130abad02d00085dffbcc 100644
--- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.cpp
+++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2010/05/12 23:28:12 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <sstream>
 #include <iomanip>
@@ -44,26 +30,26 @@ namespace Isis {
    *                      (either 1 or -1)
    *
    */
-  LroWideAngleCameraFocalPlaneMap::LroWideAngleCameraFocalPlaneMap(Camera *parent, 
-                                                                   int naifIkCode) : 
+  LroWideAngleCameraFocalPlaneMap::LroWideAngleCameraFocalPlaneMap(Camera *parent,
+                                                                   int naifIkCode) :
                                                                    CameraFocalPlaneMap(parent,
                                                                                        naifIkCode) {
   }
 
 
 /**
- * @brief Add an additional set of parameters for a given LROC/WAC filter 
- *  
- * This method will read the parameters for LROC/WAC filter as indicated by the 
- * IK code provided. It will create a vector of these parameters and append them 
- * to the band list. 
- *  
- * The filters added should correspond directly to the order in which the 
- * filters are physically stored in the ISIS cube (or the virtually selected 
- * bands). 
- * 
+ * @brief Add an additional set of parameters for a given LROC/WAC filter
+ *
+ * This method will read the parameters for LROC/WAC filter as indicated by the
+ * IK code provided. It will create a vector of these parameters and append them
+ * to the band list.
+ *
+ * The filters added should correspond directly to the order in which the
+ * filters are physically stored in the ISIS cube (or the virtually selected
+ * bands).
+ *
  * @author 2013-03-07 Kris Becker
- * 
+ *
  * @param naifIkCode NAIF IK code for the desired filter to add.
  */
   void LroWideAngleCameraFocalPlaneMap::addFilter(int naifIkCode) {
@@ -86,15 +72,15 @@ namespace Isis {
 
 
 /**
- * @brief Implements band-dependant focal plane parameters 
- *  
- * This method should be used to switch to another band's set of distortion 
- * parameters.  See the addFilter() method to add additional band parameters to 
- * this object. Note that the band number should correspond with the same order 
- * as they were added in the addFilter() method. 
- * 
+ * @brief Implements band-dependant focal plane parameters
+ *
+ * This method should be used to switch to another band's set of distortion
+ * parameters.  See the addFilter() method to add additional band parameters to
+ * this object. Note that the band number should correspond with the same order
+ * as they were added in the addFilter() method.
+ *
  * @author 2013-03-07 Kris Becker
- * 
+ *
  * @param vband  Band number to select.  Range is 1 to Bands.
  */
   void LroWideAngleCameraFocalPlaneMap::setBand(int vband) {
@@ -103,7 +89,7 @@ namespace Isis {
                      " Must be <= " + QString::number(m_transparms.size());
       throw IException(IException::Programmer, mess, _FILEINFO_);
     }
-     
+
     //  Install new parameters
     int iband = vband - 1;
     for ( int i = 0 ; i < 3 ; i++) {
diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.h b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.h
index 00f43e46bd4de02069d3d2273484190ca574248d..e08f670cd49a5349595f6bc199319434c3e49b56 100644
--- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.h
+++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.h
@@ -1,30 +1,19 @@
 #ifndef LroWideAngleCameraFocalPlaneMap_h
 #define LroWideAngleCameraFocalPlaneMap_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QVector>
 #include "CameraFocalPlaneMap.h"
 
 namespace Isis {
-  /** 
+  /**
    *  Distort/undistort focal plane coordinates
    *
    * Creates a map for adding/removing optical distortions
diff --git a/isis/src/lro/objs/LroWideAngleCamera/unitTest.cpp b/isis/src/lro/objs/LroWideAngleCamera/unitTest.cpp
index 83c12fce3726057d9f20befc075b8c59588a0397..056c4a2c464fad723a36442ba2e790f3aaede6fb 100644
--- a/isis/src/lro/objs/LroWideAngleCamera/unitTest.cpp
+++ b/isis/src/lro/objs/LroWideAngleCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -74,14 +63,14 @@ int main(void) {
     cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
     cout.setf(std::ios::fixed);
     cout << setprecision(9);
-    
+
     // Test kernel IDs
     cout << "Kernel IDs: " << endl;
     cout << "CK Frame ID = " << cam->CkFrameId() << endl;
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -123,7 +112,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     Cube c2("$ISISTESTDATA/isis/src/lro/unitTestData/out.uv.even.cub", "r");
     Camera *cam2 = CameraFactory::Create(c2);
     // Test name methods for WAC-UV
@@ -132,7 +121,7 @@ int main(void) {
     cout << "Spacecraft Name Short: " << cam2->spacecraftNameShort() << endl;
     cout << "Instrument Name Long: " << cam2->instrumentNameLong() << endl;
     cout << "Instrument Name Short: " << cam2->instrumentNameShort() << endl << endl;
-    
+
     // Test exceptions for determining names
     cout << endl << "Testing exceptions ..." << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
@@ -163,4 +152,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/lro/objs/MiniRF/MiniRF.cpp b/isis/src/lro/objs/MiniRF/MiniRF.cpp
index 7be25f1d12e027b1d3c8d5e76cf76c6e045ff698..6e408c080b794d7f04ec54016659bf556e0b9018 100644
--- a/isis/src/lro/objs/MiniRF/MiniRF.cpp
+++ b/isis/src/lro/objs/MiniRF/MiniRF.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2010/03/27 06:46:58 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MiniRF.h"
 
 #include <QString>
@@ -50,7 +37,7 @@ namespace Isis {
    *          value to pass into Spice::CreateCache() method.
    */
   MiniRF::MiniRF(Isis::Cube &cube) : Isis::RadarCamera(cube) {
-    
+
     // LRO MiniRF naif instrument code = -85700
     if (naifIkCode() == -85700) {
       m_instrumentNameLong = "Miniature Radio Frequency";
diff --git a/isis/src/lro/objs/MiniRF/MiniRF.h b/isis/src/lro/objs/MiniRF/MiniRF.h
index ad07a18ed0a762ea8a4bc4ba401b83c768fb6928..b2b5015fffeacff8154fd16fbe1a7ad9cb1ba2aa 100644
--- a/isis/src/lro/objs/MiniRF/MiniRF.h
+++ b/isis/src/lro/objs/MiniRF/MiniRF.h
@@ -1,26 +1,14 @@
 #ifndef MiniRF_h
 #define MiniRF_h
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2010/03/27 06:46:58 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "RadarCamera.h"
 
 namespace Isis {
@@ -46,24 +34,24 @@ namespace Isis {
    *   @history 2009-08-05 Debbie A. Cook - corrected altitude in tolerance
    *                           calculation
    *   @history 2009-10-16 Debbie A. Cook - fixed the rotation of the velocity vector
-   *   @history 2009-11-03 Debbie A. Cook - added RadarGroundMap method calls to set radar 
+   *   @history 2009-11-03 Debbie A. Cook - added RadarGroundMap method calls to set radar
    *                           parameters
-   *   @history 2010-03-19 Debbie A. Cook - removed unit change of rangeResolution so range_sigma 
+   *   @history 2010-03-19 Debbie A. Cook - removed unit change of rangeResolution so range_sigma
    *                           works on meters instead of km
    *   @history 2011-05-03 Jeannie Walldren - Updated unitTest to test for new
    *                           methods. Updated documentation. Removed Lro namespace wrap
    *                           inside Isis namespace wrap. Added Isis Disclaimer to files.
    *                           Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    *   @history 2016-08-01 Kristin Berry - Added to unitTest to test camera model performance on
-   *                           level 2 cubes and to test RA/DEC values. References #2400. 
+   *                           level 2 cubes and to test RA/DEC values. References #2400.
    */
   class MiniRF : public RadarCamera {
     public:
@@ -76,18 +64,18 @@ namespace Isis {
 
       virtual int CkReferenceId() const;
 
-      /** 
+      /**
        *  SPK Target Body ID - Lunar Reconnaissance Orbiter spacecraft
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Target ID
        */
       virtual int SpkTargetId() const { return (-85); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/lro/objs/MiniRF/unitTest.cpp b/isis/src/lro/objs/MiniRF/unitTest.cpp
index a3b2072e499723ba5f21622c205e6c0e9dc6830b..4ced858c072337e4ce50456ce8ced1f233585d2f 100644
--- a/isis/src/lro/objs/MiniRF/unitTest.cpp
+++ b/isis/src/lro/objs/MiniRF/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
diff --git a/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.cpp b/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.cpp
index 87cdd9e97e67041259537b013a61ca15a40bbe17..c90dd5c83e7ae4736c5d20b66d664a43a01720ef 100644
--- a/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.cpp
+++ b/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <SpiceUsr.h>
 #include <SpiceZfc.h>
 #include <SpiceZmc.h>
diff --git a/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.h b/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.h
index bd071a74b39fe6f240a81174b69150bf3f420fc7..68037bc5fe78ae45f13cb01620edf7dd1d519b56 100644
--- a/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.h
+++ b/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.h
@@ -1,6 +1,14 @@
 #ifndef PhotometricFunction_h
 #define PhotometricFunction_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IString.h"
 #include "Camera.h"
 #include "DbProfile.h"
@@ -13,14 +21,14 @@
 namespace Isis {
 
   /**
-   * @brief Implement templatized MIN fumnction 
+   * @brief Implement templatized MIN fumnction
    *
    * Returns mininum value of both inputs of a specific type
    *
    * @param A first constant value of a type for comparison
    * @param B second constant value of a type for comparison
-   * 
-   * @return @b T type value 
+   *
+   * @return @b T type value
    *
    */
   template<typename T> inline T MIN( const T &A, const T &B ) {
@@ -32,15 +40,15 @@ namespace Isis {
     }
   }
 
-  /** 
-   * @brief Implement templatized MAX fumnction 
+  /**
+   * @brief Implement templatized MAX fumnction
    *
    * Returns maximum value of both inputs of a specifific type
    *
    * @param A first constant value of a type for comparison
    * @param B second constant value of a type for comparison
    *
-   * @return @b T type value 
+   * @return @b T type value
    *
    */
   template<typename T> inline T MAX( const T &A, const T &B ) {
diff --git a/isis/src/mariner/apps/mar102isis/main.cpp b/isis/src/mariner/apps/mar102isis/main.cpp
index 531aa4e746c732259f7adbbe4ec772c88a4224aa..28fa3b415bb7e1b629822edc9f3416cacbe1e71f 100644
--- a/isis/src/mariner/apps/mar102isis/main.cpp
+++ b/isis/src/mariner/apps/mar102isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Cube.h"
diff --git a/isis/src/mariner/apps/mar10cal/main.cpp b/isis/src/mariner/apps/mar10cal/main.cpp
index 2adcb8f258497a32a1b7fce52ee075cacc6c0a4c..9f7adbbe040b524232e29723e8a4713dd5a5061a 100644
--- a/isis/src/mariner/apps/mar10cal/main.cpp
+++ b/isis/src/mariner/apps/mar10cal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cmath>
diff --git a/isis/src/mariner/apps/mar10clean/main.cpp b/isis/src/mariner/apps/mar10clean/main.cpp
index e06a2f5e7ce3ab70f4e8fe0410d47709733e2239..099e8993cbf54c2ff0305af50314797132ebdc2d 100644
--- a/isis/src/mariner/apps/mar10clean/main.cpp
+++ b/isis/src/mariner/apps/mar10clean/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Chip.h"
@@ -96,4 +104,3 @@ void IsisMain() {
   cout << p;
   p.Run();
 }
-
diff --git a/isis/src/mariner/apps/mar10nonoise/main.cpp b/isis/src/mariner/apps/mar10nonoise/main.cpp
index 9067a9233e096172fd7ab36df5cb71c0a6e641d5..ef8b448d9d715851596aa06906959f943f81bcce 100644
--- a/isis/src/mariner/apps/mar10nonoise/main.cpp
+++ b/isis/src/mariner/apps/mar10nonoise/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Cube.h"
@@ -103,4 +111,3 @@ void IsisMain() {
 
   p.Run();
 }
-
diff --git a/isis/src/mariner/apps/mar10restore/main.cpp b/isis/src/mariner/apps/mar10restore/main.cpp
index 82299f8001b65622cc328e3868e5457d81d53e58..f5c87964fdfd42fd401d66768655b8f2a24eb171 100644
--- a/isis/src/mariner/apps/mar10restore/main.cpp
+++ b/isis/src/mariner/apps/mar10restore/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Chip.h"
@@ -136,5 +144,3 @@ void IsisMain() {
 
   p.Run();
 }
-
-
diff --git a/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.cpp b/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.cpp
index f62675f9a1f50c11e85592b24ab7a06f5101f9ee..5dbf4e458ae561caef0115382e4b2f9c0d20406b 100644
--- a/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.cpp
+++ b/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.6 $
- * $Date: 2010/06/29 18:16:39 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Mariner10Camera.h"
 
@@ -58,7 +44,7 @@ namespace Isis {
    */
   Mariner10Camera::Mariner10Camera(Cube &cube) : FramingCamera(cube) {
     NaifStatus::CheckErrors();
-    
+
     m_spacecraftNameLong = "Mariner 10";
     m_spacecraftNameShort = "Mariner10";
 
@@ -132,7 +118,7 @@ namespace Isis {
     NaifStatus::CheckErrors();
   }
 
-  
+
   /**
    * Returns the shutter open and close times.  The user should pass in the
    * ExposureDuration keyword value, converted from milliseconds to seconds, and
diff --git a/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.h b/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.h
index ddc275a8b76569c696c34e3bf5390aaf7fd92a76..3322e6b4d148dae163e166dcf3b1cbb49cee09dd 100644
--- a/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.h
+++ b/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.h
@@ -1,26 +1,13 @@
 #ifndef Mariner10Camera_h
 #define Mariner10Camera_h
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2010/06/29 18:16:39 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -51,12 +38,12 @@ namespace Isis {
    *                          method. Updated unitTest to test for new methods.
    *                          Updated documentation. Added Isis Disclaimer to
    *                          files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
    *   @history 2015-08-25 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -65,29 +52,29 @@ namespace Isis {
       Mariner10Camera(Cube &cube);
       //! Destroys the Mariner10Camera Object
       ~Mariner10Camera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-76000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/mariner/objs/Mariner10Camera/unitTest.cpp b/isis/src/mariner/objs/Mariner10Camera/unitTest.cpp
index 6f1618e008b522b6995d707f4fc7d7ac7488efa3..7422c365cdb416389720f190c2adc9badc21b34e 100644
--- a/isis/src/mariner/objs/Mariner10Camera/unitTest.cpp
+++ b/isis/src/mariner/objs/Mariner10Camera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -82,16 +71,16 @@ int main(void) {
       cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
       cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
       cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-      
+
       // Test name methods
       cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
       cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
       cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
       cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
 
-      // Test Shutter Open/Close 
+      // Test Shutter Open/Close
       const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
-      double exposureDuration = ((double) inst["ExposureDuration"])/1000; 
+      double exposureDuration = ((double) inst["ExposureDuration"])/1000;
       QString stime = inst["StartTime"];
       double et; // StartTime keyword is the center exposure time
       str2et_c(stime.toLatin1().data(), &et);
@@ -136,7 +125,7 @@ int main(void) {
       }
       cout << endl << "--------------------------------------------" << endl;
     }
-    
+
     // Test exception: camera is not a supported Kaguya camera
     cout << endl << "Testing exceptions:" << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
@@ -167,4 +156,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/mer/apps/mer2isis/main.cpp b/isis/src/mer/apps/mer2isis/main.cpp
index 80880903121e811fa8e8ed2620b7453196d56ef6..cebebc7c721005394990e6c35ce6d1607020546b 100644
--- a/isis/src/mer/apps/mer2isis/main.cpp
+++ b/isis/src/mer/apps/mer2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "ProcessImportPds.h"
diff --git a/isis/src/mer/apps/mical/MiCalibration.cpp b/isis/src/mer/apps/mical/MiCalibration.cpp
index 22c28c27cb81fe84d254933eb4a86d1881c6c5df..30effa4765a982c5b3328cc18db8fb493f11dcbd 100644
--- a/isis/src/mer/apps/mical/MiCalibration.cpp
+++ b/isis/src/mer/apps/mical/MiCalibration.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 
 #include "MiCalibration.h"
@@ -136,5 +144,3 @@ namespace Isis {
 
   }
 }
-
-
diff --git a/isis/src/mer/apps/mical/MiCalibration.h b/isis/src/mer/apps/mical/MiCalibration.h
index 86f9d89d06e5b5e45d9242184b33bd74181af81b..c895684f2c354b798cd6a5805b0eb9c397b74296 100644
--- a/isis/src/mer/apps/mical/MiCalibration.h
+++ b/isis/src/mer/apps/mical/MiCalibration.h
@@ -1,6 +1,14 @@
 #ifndef MiCalibration_h
 #define MiCalibration_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "Pvl.h"
 #include "Statistics.h"
diff --git a/isis/src/mer/apps/mical/main.cpp b/isis/src/mer/apps/mical/main.cpp
index 80585a8fd09b4226222bd3dcede527b7996abdf4..ac085dc3c74185d545b86ec22b281094bab47a0d 100644
--- a/isis/src/mer/apps/mical/main.cpp
+++ b/isis/src/mer/apps/mical/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #define GUIHELPERS
 
 #include "Isis.h"
diff --git a/isis/src/messenger/apps/mdis2isis/main.cpp b/isis/src/messenger/apps/mdis2isis/main.cpp
index 30998a8688ed832c57a634af07505e22258a18e7..5a8b1e769d2f2cd0cd6e9cc93c6672e79447dbfc 100644
--- a/isis/src/messenger/apps/mdis2isis/main.cpp
+++ b/isis/src/messenger/apps/mdis2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // $Id: mdis2isis.cpp 5059 2013-03-11 16:37:00Z slambright@GS.DOI.NET $
 #include "Isis.h"
 
@@ -287,7 +295,7 @@ int CreateFilterSpecs(const QString &instId, int filter_code,
   }
   else if(instId == "MDIS-WAC") {
     //  Set up WAC calibration file
-    FileName calibFile("$messenger/calibration/mdisCalibration????.trn"); 
+    FileName calibFile("$messenger/calibration/mdisCalibration????.trn");
     calibFile = calibFile.highestVersion();
     Pvl config(calibFile.expanded());
 
diff --git a/isis/src/messenger/apps/mdis2pds/main.cpp b/isis/src/messenger/apps/mdis2pds/main.cpp
index c6f4b2bdb3296790743414aaeeb481881577711c..b835412fd0239c054c60566874be3174dc852742 100644
--- a/isis/src/messenger/apps/mdis2pds/main.cpp
+++ b/isis/src/messenger/apps/mdis2pds/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cmath>
diff --git a/isis/src/messenger/apps/mdiscal/DarkModelPixel.h b/isis/src/messenger/apps/mdiscal/DarkModelPixel.h
index 0906c4ee3af496d8f079a97679330f5401bfd9e6..7f69b253f87e39eaa93a1763dbae109a8a472884 100644
--- a/isis/src/messenger/apps/mdiscal/DarkModelPixel.h
+++ b/isis/src/messenger/apps/mdiscal/DarkModelPixel.h
@@ -1,27 +1,14 @@
 #ifndef DarkModelPixel_h
 #define DarkModelPixel_h
-/**
- * @file
- * $Revision: 6403 $
- * $Date: 2015-10-23 12:32:20 -0700 (Fri, 23 Oct 2015) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 
@@ -37,7 +24,7 @@ namespace Isis {
   /**
    * @author ????-??-?? Unknown
    *
-   * @internal 
+   * @internal
    *   @history 2015-09-01 Jeannie Backer - Brought code closer to coding standards.
    */
   class DarkModelPixel {
@@ -158,4 +145,3 @@ namespace Isis {
 
 };
 #endif
-
diff --git a/isis/src/messenger/apps/mdiscal/MdisCalUtils.h b/isis/src/messenger/apps/mdiscal/MdisCalUtils.h
index b8a6e38ff76acbdf587a41f0b324173c4612dd85..04694ce267061474542abc0d2025d3b9420cda6a 100644
--- a/isis/src/messenger/apps/mdiscal/MdisCalUtils.h
+++ b/isis/src/messenger/apps/mdiscal/MdisCalUtils.h
@@ -1,27 +1,14 @@
 #ifndef MdisCalUtils_h
 #define MdisCalUtils_h
-/**
- * @file
- * $Revision: 6715 $
- * $Date: 2016-04-28 10:58:43 -0700 (Thu, 28 Apr 2016) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
@@ -260,30 +247,30 @@ namespace Isis {
   }
 
 /**
- * @brief Load and retrieve empirical correction factor 
- *  
- * This function determines the empirical correction factor for changes that 
- * that occured on the spacecraft after Mercury orbit insertion.  The 
- * affected dates are May 24, 2011 to January 3, 2012. 
- *  
- * The table of correction factors is expected to be stored in 
- * $messenger/calibration/events/event_table_ratioed_v?.txt.  However, the 
- * caller may provide a table that conforms to the expected format.  The 
+ * @brief Load and retrieve empirical correction factor
+ *
+ * This function determines the empirical correction factor for changes that
+ * that occured on the spacecraft after Mercury orbit insertion.  The
+ * affected dates are May 24, 2011 to January 3, 2012.
+ *
+ * The table of correction factors is expected to be stored in
+ * $messenger/calibration/events/event_table_ratioed_v?.txt.  However, the
+ * caller may provide a table that conforms to the expected format.  The
  * expected format for the empirical correction file is a comma separated value
- * (CSV) table that contains 13 columns of data per row.  The first column is 
- * the UTC time during the event. The next 12 columns contain multiplicative 
- * correction factors for each WAC filter (NAC correction factors are not 
- * provided). These factors are expected to be around 1.0 (the default) as it 
- * is expected to directly scale DN values. 
- *  
- * Below is the expected mapping of column indexes to filter numbers as 
- * specfied in the BandBin/Number keyword from MDIS ISIS cube labels. Index is 
- * the column index from each row for a given filter, Number is the value of 
- * the BandBin/Number keyword from the label designating the filter number 
+ * (CSV) table that contains 13 columns of data per row.  The first column is
+ * the UTC time during the event. The next 12 columns contain multiplicative
+ * correction factors for each WAC filter (NAC correction factors are not
+ * provided). These factors are expected to be around 1.0 (the default) as it
+ * is expected to directly scale DN values.
+ *
+ * Below is the expected mapping of column indexes to filter numbers as
+ * specfied in the BandBin/Number keyword from MDIS ISIS cube labels. Index is
+ * the column index from each row for a given filter, Number is the value of
+ * the BandBin/Number keyword from the label designating the filter number
  * (corresponding to the filter parameter passed to this routine) and Letter is
- * the filter letter designation used in the last alpha numeric character in 
- * MDIS filenames: 
- *  
+ * the filter letter designation used in the last alpha numeric character in
+ * MDIS filenames:
+ *
  *  Index   Number   Letter   Wavelength
  *    1       6        F         430 nm
  *    2       3        C         480 nm
@@ -297,41 +284,41 @@ namespace Isis {
  *   10       2        B        Filter 2 (clear)
  *   11       8        H        Filter 8 (950 nm)
  *   12      11        K        Filter 11 (1010 nm)
- *  
- * The UTC dates in the first column are assumed to be strictly increasing in 
- * time.  The initial table (*_v2) contains dates that span the complete 
- * expected timeframe of the mission (launch at 2004-08-04T10:00:00.000000, 
- * termination at 2015-01-03T09:00:00.000000). 
- *  
- * The spacecraft clock time is provided as input (scStartTime) to this 
- * function.  This value is converted to ET (SCET) and used to determine the 
- * corresponding event time in the first column of the table.  The first table 
- * column time is represented in UTC time.  This time is converted to ET and 
- * then compared with the start time in ET. 
- *  
- * The algorithm searches linearly through the table essentially storing the 
- * time slot prior to the SCET and the next occuring one.  Ultimately, the 
- * factor returned by the algorithm is the one whose event time is closest to 
- * the SCET. 
- *  
+ *
+ * The UTC dates in the first column are assumed to be strictly increasing in
+ * time.  The initial table (*_v2) contains dates that span the complete
+ * expected timeframe of the mission (launch at 2004-08-04T10:00:00.000000,
+ * termination at 2015-01-03T09:00:00.000000).
+ *
+ * The spacecraft clock time is provided as input (scStartTime) to this
+ * function.  This value is converted to ET (SCET) and used to determine the
+ * corresponding event time in the first column of the table.  The first table
+ * column time is represented in UTC time.  This time is converted to ET and
+ * then compared with the start time in ET.
+ *
+ * The algorithm searches linearly through the table essentially storing the
+ * time slot prior to the SCET and the next occuring one.  Ultimately, the
+ * factor returned by the algorithm is the one whose event time is closest to
+ * the SCET.
+ *
  * The empirical correction model and algorithm was developed by
  * Mary Ruth Keller of JHA/APL.
  *
  * @author Kris Becker - 10/23/2012
- * 
+ *
  * @param scStartTime - Start time of the image in SCLK format
  * @param filter      - WAC filter number to return event correction factor for
- * @param ename       - Returns the name of the event table file if not 
+ * @param ename       - Returns the name of the event table file if not
  *                      provided by caller.  If non-empty string is passed by
  *                      caller, it is assumed to be a fully qualified filename
  *                      of the event table.
- * @param eDate       - Returns the UTC date entry of the selected correction 
+ * @param eDate       - Returns the UTC date entry of the selected correction
  *                      event factor
- * 
- * @return double     - Event correction factor at the selected time to apply 
+ *
+ * @return double     - Event correction factor at the selected time to apply
  *                      to WAC filter data.
  */
- double loadEmpiricalCorrection(const QString &scStartTime, const int filter, 
+ double loadEmpiricalCorrection(const QString &scStartTime, const int filter,
                                 QString &ename, QString &eDate) {
 
    //  This table maps the filter number extracted from BandBin/Number keyword
@@ -351,9 +338,9 @@ namespace Isis {
    // Ensure we have a valid filter number
    if (column <= 0) {
      std::ostringstream mess;
-      mess << "Invalid MDIS WAC filter number (" << filter 
+      mess << "Invalid MDIS WAC filter number (" << filter
            <<  " - range:1-12) for determining index into empirical correction table.";
-      throw IException(IException::User, mess.str(), _FILEINFO_);     
+      throw IException(IException::User, mess.str(), _FILEINFO_);
    }
 
    //  File name not provided by caller.  Determine the event table name
@@ -369,7 +356,7 @@ namespace Isis {
     const int skip = 0;         // No lines to skip to data
     const int nvalues = 13;     // Expected columns in table
     CSVReader csv(csvfile.expanded(), header, skip);
-    if (csv.columns() < nvalues) {  // All rows should have same # columns 
+    if (csv.columns() < nvalues) {  // All rows should have same # columns
       QString mess = "Number values (" + QString(csv.columns()) +
                          ") in file " + ename + " less than number requested (" +
                          QString(nvalues) + ")!";
@@ -410,7 +397,7 @@ namespace Isis {
       preEventTime = eTime;
       evalue = toDouble(eRow[column]);
     }
- 
+
     // Return the factor
     return (evalue);
   }
diff --git a/isis/src/messenger/apps/mdiscal/main.cpp b/isis/src/messenger/apps/mdiscal/main.cpp
index a7f8eeb1878d2489f943defb92473888ae0ad4aa..92e1193d4216a63db560b403dee8594aab44fcc5 100644
--- a/isis/src/messenger/apps/mdiscal/main.cpp
+++ b/isis/src/messenger/apps/mdiscal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // $Id: mdiscal.cpp 6715 2016-04-28 17:58:43Z tsucharski@GS.DOI.NET $
 #include "Isis.h"
 
diff --git a/isis/src/messenger/apps/mdisddr/main.cpp b/isis/src/messenger/apps/mdisddr/main.cpp
index 7e2460c7ade799ec13b49db2625998c76ae45282..6ee844ced44fdc77785b23c878a4cfa7abbfc27b 100644
--- a/isis/src/messenger/apps/mdisddr/main.cpp
+++ b/isis/src/messenger/apps/mdisddr/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cmath>
diff --git a/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h b/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h
index 7ecc54b0a3ef42268bc0048820800aa2a4127ede..3c3d48a65350a66c5614bb9f150b77d8cd0b51e3 100644
--- a/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h
+++ b/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h
@@ -1,27 +1,13 @@
 #ifndef MdisEdrKeys_h
 #define MdisEdrKeys_h
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2008/09/22 20:46:27 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -351,4 +337,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
diff --git a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp
index 9de3a2d22532f01199a4be1151d45602d6a8b8c9..22a58cac744824320279ca3060d44148ecce6084 100644
--- a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp
+++ b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp
@@ -1,26 +1,11 @@
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2009/12/29 23:03:50 $
- * $Id: MdisGeometry.cpp,v 1.9 2009/12/29 23:03:50 ehyer Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MdisGeometry.h"
 
 #include <cmath>
@@ -112,7 +97,7 @@ namespace Isis {
 
     //  Get the target and check for validity
     PvlKeyword &target = label.findKeyword("TargetName", PvlObject::Traverse);
-    
+
     try {
       Target::lookupNaifBodyCode(target);
       return (true);
@@ -977,7 +962,7 @@ namespace Isis {
     SpiceDouble stateJ[6];  // Position and velocity vector in J2000
     SpiceDouble lt;
     spkez_c(sc , rotate->EphemerisTime(), "J2000", "LT+S", sun, stateJ, &lt);
-    NaifStatus::CheckErrors(); 
+    NaifStatus::CheckErrors();
 
     // Stage result and negate as it needs to be relative to Messenger
     vector<double> scvel;
@@ -1201,5 +1186,3 @@ namespace Isis {
     return (QString::fromStdString(strcnv.str().c_str()));
   }
 }  // namespace Isis
-
-
diff --git a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.h b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.h
index 825926958bfd3123b884996f377adf990c1cff78..6bd29e38263b57456cdba6f6fbdf0908befa2873 100644
--- a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.h
+++ b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.h
@@ -1,27 +1,13 @@
 #ifndef MdisGeometry_h
 #define MdisGeometry_h
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2009/09/19 00:12:10 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -64,17 +50,17 @@ namespace Isis {
    *                           Sky (it was previously only computed when the
    *                           center reference pixel intersected the target).
    *   @history 2009-09-18 Debbie A. Cook - corrected pxlscl and explen in MdisGeometry
-   *   @history 2012-04-06 Kris Becker - Corrected TWIST_ANGLE computation to 
+   *   @history 2012-04-06 Kris Becker - Corrected TWIST_ANGLE computation to
    *                           ensure it is restricted to the 0-360 degree domain.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards.  References #972..
-   *   @history 2012-10-11 Debbie A. Cook, Updated to use new Target class.  References  
+   *   @history 2012-10-11 Debbie A. Cook, Updated to use new Target class.  References
    *                           #775 and #1114.
    *   @history 2012-11-30 Debbie A. Cook - Changed to use TProjection instead of Projection.
    *                           References #775.
    *   @history 2015-07-22 Kristin Berry -  Added NaifStatus::CheckErrors() to see if any NAIF
    *                           errors were signaled. References #2248.
-   *   @history 2016-05-10 Jeannie Backer - Replaced call to NAIF routine bodn2c with call to static 
+   *   @history 2016-05-10 Jeannie Backer - Replaced call to NAIF routine bodn2c with call to static
    *                           method Isis::Target::lookupNaifBodyCode. Reference #3934
    */
   class MdisGeometry {
@@ -197,4 +183,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
diff --git a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp
index 2d5ffb45fc7b44cffc5e32f5e61a68681c16e7df..b2e444632639df9d0d218aa78cc9f425736af6d0 100644
--- a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp
+++ b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp
@@ -1,26 +1,11 @@
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2009/12/29 23:03:50 $
- * $Id: SpiceManager.cpp,v 1.9 2009/12/29 23:03:50 ehyer Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 #include <numeric>
@@ -219,7 +204,7 @@ namespace Isis {
    * @see  loadKernelFromTable()
    */
   void SpiceManager::loadKernel(PvlKeyword &key) {
-    NaifStatus::CheckErrors(); 
+    NaifStatus::CheckErrors();
     for(int i = 0; i < key.size(); i++) {
       if(key[i] == "") continue;
       if(IString(key[i]).UpCase() == "NULL") continue;
@@ -234,7 +219,7 @@ namespace Isis {
       if(_furnish) furnsh_c(fileName.toLatin1().data());
       addKernelName((QString)key[i]);
     }
-    NaifStatus::CheckErrors(); 
+    NaifStatus::CheckErrors();
   }
 
   /**
@@ -286,5 +271,3 @@ namespace Isis {
   }
 
 }  // namespace Isis
-
-
diff --git a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.h b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.h
index 9957ff10bf37f7507367feb690f20ea5f4991125..9fa41b22ae458c4f1f912a0baea2e836cfb81519 100644
--- a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.h
+++ b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.h
@@ -1,27 +1,13 @@
 #ifndef SpiceManager_h
 #define SpiceManager_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2007/08/23 07:15:44 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -53,7 +39,7 @@ namespace Isis {
    * @author 2007-08-19 Kris Becker
    *
    * @internal
-   * @history 2015-07-22 Kristin Berry -  Added NaifStatus::CheckErrors() to see if any NAIF errors 
+   * @history 2015-07-22 Kristin Berry -  Added NaifStatus::CheckErrors() to see if any NAIF errors
    *                       were signaled. References #2248.
    */
   class SpiceManager {
@@ -92,4 +78,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
diff --git a/isis/src/messenger/apps/mdisedrinfo/main.cpp b/isis/src/messenger/apps/mdisedrinfo/main.cpp
index 3121445a45f10fe7333c5de7c16a3ae81c4b3d16..7eeed96b733e70b8264e220e419f406d06442147 100644
--- a/isis/src/messenger/apps/mdisedrinfo/main.cpp
+++ b/isis/src/messenger/apps/mdisedrinfo/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 //  $Id: mdisedrinfo.cpp,v 1.8 2008/07/11 22:38:41 nhilt Exp $
 #include "Isis.h"
 
@@ -170,4 +178,3 @@ void IsisMain() {
   QString fromName(from.expanded());
   if(delete_from) remove(fromName.toLatin1().data());
 }
-
diff --git a/isis/src/messenger/apps/mdisproc/main.cpp b/isis/src/messenger/apps/mdisproc/main.cpp
index 62e4ba0b731afe9fb710adcfb1c66532461da10d..467f19bf421f84107328565c9fe73087b4040dcb 100644
--- a/isis/src/messenger/apps/mdisproc/main.cpp
+++ b/isis/src/messenger/apps/mdisproc/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <string>
diff --git a/isis/src/messenger/objs/MdisCamera/MdisCamera.cpp b/isis/src/messenger/objs/MdisCamera/MdisCamera.cpp
index c120a8c2b92a88623684bce31d3b043fc016f513..ab321222b777f0a1bdc80203a7405f422c5bac11 100644
--- a/isis/src/messenger/objs/MdisCamera/MdisCamera.cpp
+++ b/isis/src/messenger/objs/MdisCamera/MdisCamera.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 6403 $
- * $Date: 2015-10-23 12:32:20 -0700 (Fri, 23 Oct 2015) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <cmath>
 
@@ -64,15 +50,15 @@ namespace Isis {
   MdisCamera::MdisCamera(Cube &cube) : FramingCamera(cube) {
     m_spacecraftNameLong = "Messenger";
     m_spacecraftNameShort = "Messenger";
-    
+
     NaifStatus::CheckErrors();
-    
+
     // Set up detector constants
     // Note that Wac has filters, -236800 through -236812
     // http://naif.jpl.nasa.gov/pub/naif/pds/data/mess-e_v_h-spice-6-v1.0/messsp_1000/data/ik/msgr_mdis_v160.ti
     const int MdisWac(-236800);
     const int MdisNac(-236820);
-    
+
     if (naifIkCode() == MdisNac) {
       m_instrumentNameLong = "Mercury Dual Imaging System Narrow Angle Camera";
       m_instrumentNameShort = "MDIS-NAC";
@@ -86,7 +72,7 @@ namespace Isis {
       msg += " is not a supported instrument kernel code for Messenger.";
       throw IException(IException::Programmer, msg, _FILEINFO_);
     }
-    
+
     Pvl &lab = *cube.label();
     PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse);
 
@@ -250,15 +236,15 @@ namespace Isis {
   /**
    * Returns the shutter open and close times.  The user should pass in the
    * ExposureDuration keyword value, converted from milliseconds to seconds, and
-   * the SpacecraftClockCount keyword value, converted to ephemeris time. The 
-   * StartTime keyword value from the labels represents the shutter open time of 
-   * the observation. This method uses the FramingCamera class implementation, 
-   * returning the given time value as the shutter open and the sum of the time 
-   * value and exposure duration as the shutter close. 
+   * the SpacecraftClockCount keyword value, converted to ephemeris time. The
+   * StartTime keyword value from the labels represents the shutter open time of
+   * the observation. This method uses the FramingCamera class implementation,
+   * returning the given time value as the shutter open and the sum of the time
+   * value and exposure duration as the shutter close.
    *
    * @param exposureDuration Exposure duration value from the labels, converted
    *                         to seconds.
-   * @param time The SpacecraftClockCount value from the labels, converted to 
+   * @param time The SpacecraftClockCount value from the labels, converted to
    *             ephemeris time
    * @return @b pair < @b iTime, @b iTime > The first value is the shutter
    *         open time and the second is the shutter close time.
@@ -275,32 +261,32 @@ namespace Isis {
 
 
 /**
- * @brief Computes temperature-dependent focal length 
- *  
- * This method computes temperature dependent focal lengths based upon a 5th 
+ * @brief Computes temperature-dependent focal length
+ *
+ * This method computes temperature dependent focal lengths based upon a 5th
  * order polynomial using the FocalPlaneTemperature keyword value stored in the
- * ISIS label (it is the FOCAL_PLANE_TEMPERATURE PDS keyword).  At the time of 
- * this writing, only (the two) linear terms are used. 
- *  
- * In addition, this method is initially coded to be backword compatible but 
- * this feature is likely to be removed when the kernels become fully adopted. 
- *  
- * IMPORTANT:  The computed temperature dependent focal length is stored in the 
+ * ISIS label (it is the FOCAL_PLANE_TEMPERATURE PDS keyword).  At the time of
+ * this writing, only (the two) linear terms are used.
+ *
+ * In addition, this method is initially coded to be backword compatible but
+ * this feature is likely to be removed when the kernels become fully adopted.
+ *
+ * IMPORTANT:  The computed temperature dependent focal length is stored in the
  * label of the cube during spiceinit.  This implementation uses the special
- * recording of keywords as retrieved from kernels and stores them as a string 
- * value so (SOCET) folks can easily read and apply the focal lengths in their 
- * environments.  String storage is preferred over storing as double since 
- * these values are stored in hexidecimal format. 
- *  
+ * recording of keywords as retrieved from kernels and stores them as a string
+ * value so (SOCET) folks can easily read and apply the focal lengths in their
+ * environments.  String storage is preferred over storing as double since
+ * these values are stored in hexidecimal format.
+ *
  * @author Kris Becker (8/13/2012)
  * @internal
  *  @history 2012-10-22 Kris Becker - Store temperature dependant keyword in instrument
  *                                    neutral keyword called TempDependentFocalLength.
- * 
+ *
  * @param filterCode Integer MDIS instrument/filter code
- * @param label      Pvl label from cube being initialized where temperature 
+ * @param label      Pvl label from cube being initialized where temperature
  *                   keywords are extracted from.
- * 
+ *
  * @return double    Computed temperature dependant focal length
  */
   double MdisCamera::computeFocalLength(const QString &filterCode,
@@ -334,14 +320,14 @@ namespace Isis {
         tdfl_disabled = false;
       }
 #endif
-      
+
       // Attempt to retrieve parameters necessary for temperature-dependent focal
       // length and computed it
       if ( !tdfl_disabled ) {
         // Wrap a try clause all around this so that if it fails, will return
         // default
         try {
-          PvlGroup &inst = label.findGroup("Instrument", Pvl::Traverse);      
+          PvlGroup &inst = label.findGroup("Instrument", Pvl::Traverse);
           double fpTemp = inst["FocalPlaneTemperature"];
           double fl(0.0);
           QString fptCoeffs = "INS" + filterCode + "_FL_TEMP_COEFFS";
diff --git a/isis/src/messenger/objs/MdisCamera/MdisCamera.h b/isis/src/messenger/objs/MdisCamera/MdisCamera.h
index 102bed73e7d1341124c5dd2266345e0bcae95ec6..4cd8f59755b57539ab6ccdfddc538e02ea5d78db 100644
--- a/isis/src/messenger/objs/MdisCamera/MdisCamera.h
+++ b/isis/src/messenger/objs/MdisCamera/MdisCamera.h
@@ -1,26 +1,14 @@
 #ifndef MdisCamera_h
 #define MdisCamera_h
-/**
- * @file
- * $Revision: 6403 $
- * $Date: 2015-10-23 12:32:20 -0700 (Fri, 23 Oct 2015) $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "FramingCamera.h"
 
 #include <QString>
@@ -37,7 +25,7 @@ namespace Isis {
    * file $ISISDATA/messenger/kernels/iak/mdisAddendum???.ti for details.
    *
    * @ingroup SpiceInstrumentsAndCameras
-   * @ingroup Messenger 
+   * @ingroup Messenger
    * @see http://pds-imaging.jpl.nasa.gov/documentation/MDISEDRSIS.PDF
    * @see http://pds-imaging.jpl.nasa.gov/documentation/MDIS_CDR_RDRSIS.PDF
    *
@@ -83,7 +71,7 @@ namespace Isis {
    *                           documentation. Removed Messenger namespace wrap inside Isis
    *                           namespace wrap. Added Isis Disclaimer to files. Added NAIF error
    *                           check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2012-07-25 Kris Becker - Added temperature dependant focal
    *                           length computation from new IK content.  Fixes #922.
@@ -102,7 +90,7 @@ namespace Isis {
    *   @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Updated check for Wac instrument to
    *                           include instrument codes that correspond to its filters. References
    *                           #2335.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -111,19 +99,19 @@ namespace Isis {
       MdisCamera(Cube &cube);
       //! Destroys the MdisCamera Object
       ~MdisCamera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
       /**
        * CK frame ID -  - MESSENGER instrument code (MSGR_SPACECRAFT)
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-236000); }
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
@@ -135,10 +123,10 @@ namespace Isis {
        *         Kernel Target ID
        */
       virtual int SpkTargetId() const { return (-236); }
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.cpp b/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.cpp
index 001945d424f500262de9342bae516f55eaa5db3f..99608c0ce48965db2743f5f31417483f3eb74ab8 100644
--- a/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.cpp
+++ b/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <cmath>
 #include "IString.h"
@@ -25,13 +13,13 @@
 using namespace std;
 namespace Isis {
 
-  /** 
+  /**
    *  @brief Taylor series camera distortion map constructor.
    *
-   * Create a geometric distortion model which is approximated by a third-order 
+   * Create a geometric distortion model which is approximated by a third-order
    * Taylor series expansion. This class maps between distorted and undistorted
-   * focal plane x/y's. The default mapping is the identity, that is, the focal 
-   * plane x/y and undistorted focal plane x/y will be identical. 
+   * focal plane x/y's. The default mapping is the identity, that is, the focal
+   * plane x/y and undistorted focal plane x/y will be identical.
    *
    * @param parent        the parent camera that will use this distortion map
    * @param zDirection    the direction of the focal plane Z-axis
@@ -42,7 +30,7 @@ namespace Isis {
     CameraDistortionMap(parent, zDirection) {
   }
 
-  /** 
+  /**
    *  @brief Load distortion coefficients.
    *
    * This method loads the distortion coefficients from the instrument
@@ -81,7 +69,7 @@ namespace Isis {
     }
   }
 
-  /** 
+  /**
    *  @brief Compute undistorted focal plane x/y.
    *
    * Compute undistorted focal plane x/y given a distorted focal plane x/y.
@@ -171,7 +159,7 @@ namespace Isis {
     return true;
   }
 
-  /** 
+  /**
    *  @brief Compute distorted focal plane x/y.
    *
    * Compute distorted focal plane x/y given an undistorted focal plane x/y.
@@ -291,4 +279,3 @@ namespace Isis {
  * Please direct questions to
  * Lillian Nguyen, JHUAPL, (443)778-5477, Lillian.Nguyen@jhuapl.edu
  */
-
diff --git a/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.h b/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.h
index d2d838ae1a3ad143a86a71c94b665c98202efb77..85f7adbf337f59f2b10b260f37bdb1177a943cfe 100644
--- a/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.h
+++ b/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.h
@@ -1,24 +1,13 @@
 #ifndef TaylorCameraDistortionMap_h
 #define TaylorCameraDistortionMap_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #ifndef CameraDistortionMap_h
 #include "CameraDistortionMap.h"
@@ -29,12 +18,12 @@ namespace Isis {
   /** Distort/undistort focal plane coordinates
    *
    * Creates a map for adding/removing optical distortions
-   * from the focal plane of a camera.  This class describes a non-radial 
-   * distortion map. The distortion map is a third-order Taylor series expansion 
-   * of a generic function. 
+   * from the focal plane of a camera.  This class describes a non-radial
+   * distortion map. The distortion map is a third-order Taylor series expansion
+   * of a generic function.
    *
    * @ingroup SpiceInstrumentsAndCameras
-   * @ingroup Messenger 
+   * @ingroup Messenger
    *
    * @see MdisCamera
    * @see CameraDistortionMap
@@ -45,7 +34,7 @@ namespace Isis {
    *   @history 2011-05-03 Jeannie Walldren - Added Isis disclaimer.
    *   @history 2011-05-23 Janet Barrett and Steven Lambright - Spice::GetDouble
    *                         is no longer a static call.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                         coding standards. References #972
    */
   class TaylorCameraDistortionMap : public CameraDistortionMap {
diff --git a/isis/src/messenger/objs/MdisCamera/unitTest.cpp b/isis/src/messenger/objs/MdisCamera/unitTest.cpp
index e9563969f8da34126c21e93a32d5872a48c4b433..140552d7c4bbd32b49c686716e376c980f96b7ee 100644
--- a/isis/src/messenger/objs/MdisCamera/unitTest.cpp
+++ b/isis/src/messenger/objs/MdisCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -64,7 +53,7 @@ int main(void) {
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
@@ -110,13 +99,13 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Testing name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     QList<QString> files;
     files.append("$ISISTESTDATA/isis/src/messenger/unitTestData/EW0089570936I.cub");
     files.append("$ISISTESTDATA/isis/src/messenger/unitTestData/DN0163645629M_DE_0.reduced.cub");
-    
+
     for (int i = 0; i < files.size(); i++) {
       Cube m(files[i], "r");
       MdisCamera *mCam = (MdisCamera *) CameraFactory::Create(m);
@@ -151,4 +140,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp b/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp
index 56f3e3c50731f39ffa3ef68735099df432d150ed..9ed5994b37de70457861c5c59b67df505ed1e192 100644
--- a/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp
+++ b/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ProcessImportPds.h"
 #include "hrsc2isis.h"
 #include "UserInterface.h"
diff --git a/isis/src/mex/apps/hrsc2isis/hrsc2isis.h b/isis/src/mex/apps/hrsc2isis/hrsc2isis.h
index 94938b146a875ccbb58b4eaf205d497b31e818e4..26edfe4441f2f8ab90c0afce095f2cffc325b7cb 100644
--- a/isis/src/mex/apps/hrsc2isis/hrsc2isis.h
+++ b/isis/src/mex/apps/hrsc2isis/hrsc2isis.h
@@ -1,6 +1,14 @@
 #ifndef hrsc2isis_h
 #define hrsc2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 
 namespace Isis {
diff --git a/isis/src/mex/apps/hrsc2isis/main.cpp b/isis/src/mex/apps/hrsc2isis/main.cpp
index bd2adda39eb4aced28c0bbf616da84ea061d94f6..9aec221a79abe763466321b6d5ed3879176d8248 100644
--- a/isis/src/mex/apps/hrsc2isis/main.cpp
+++ b/isis/src/mex/apps/hrsc2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "UserInterface.h"
 #include "hrsc2isis.h"
diff --git a/isis/src/mex/objs/HrscCamera/HrscCamera.cpp b/isis/src/mex/objs/HrscCamera/HrscCamera.cpp
index cfce9fcc471bb1955f9343ae331c74acba1dad18..07c7140087b9bc1fb05ac6f80e5acc5be0a9c359 100644
--- a/isis/src/mex/objs/HrscCamera/HrscCamera.cpp
+++ b/isis/src/mex/objs/HrscCamera/HrscCamera.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2009/08/31 15:12:30 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "HrscCamera.h"
 
@@ -49,7 +35,7 @@ namespace Isis {
     m_instrumentNameShort = "HRSC";
     m_spacecraftNameLong = "Mars Express";
     m_spacecraftNameShort = "MEX";
-    
+
     NaifStatus::CheckErrors();
     // Setup camera characteristics from instrument and frame kernel
     SetFocalLength();
@@ -101,34 +87,34 @@ namespace Isis {
 
   /**
    * CK frame ID -  - Instrument Code from spacit run on CK
-   *  
-   * @return @b int The appropriate instrument code for the "Camera-matrix" 
+   *
+   * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Frame ID
    */
-  int HrscCamera::CkFrameId() const { 
-    return (-41001); 
+  int HrscCamera::CkFrameId() const {
+    return (-41001);
   }
 
 
-  /** 
+  /**
    * CK Reference ID - J2000
-   * 
+   *
    * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Reference ID
    */
-  int HrscCamera::CkReferenceId() const { 
-    return (1); 
+  int HrscCamera::CkReferenceId() const {
+    return (1);
   }
 
 
-  /** 
+  /**
    * SPK Reference ID - J2000
-   * 
+   *
    * @return @b int The appropriate instrument code for the Spacecraft
    *         Kernel Reference ID
    */
-  int HrscCamera::SpkReferenceId() const { 
-    return (1); 
+  int HrscCamera::SpkReferenceId() const {
+    return (1);
   }
 
 
diff --git a/isis/src/mex/objs/HrscCamera/HrscCamera.h b/isis/src/mex/objs/HrscCamera/HrscCamera.h
index 26c1c8599015c24246f9208e257b9179a6c24830..4ae8794b589ce5dd8c76a1be4381cc69e3a5ccd3 100644
--- a/isis/src/mex/objs/HrscCamera/HrscCamera.h
+++ b/isis/src/mex/objs/HrscCamera/HrscCamera.h
@@ -1,26 +1,13 @@
 #ifndef HrscCamera_h
 #define HrscCamera_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2009/08/31 15:12:31 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -33,8 +20,8 @@ namespace Isis {
    * @brief HRSC Camera Model
    *
    * This class is the implementation of the camera model
-   * for the Mars Express HRSC (High/Super Resolution Stereo Colour Imager) 
-   * instrument. 
+   * for the Mars Express HRSC (High/Super Resolution Stereo Colour Imager)
+   * instrument.
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup MarsExpress
@@ -52,12 +39,12 @@ namespace Isis {
    *                           for new methods. Updated documentation. Removed Mex
    *                           namespace wrap inside Isis namespace. Added Isis Disclaimer to
    *                           files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    *   @history 2016-10-21 Kristin Berry - Backward Compatibility Issue: Updates to improve
@@ -83,7 +70,7 @@ namespace Isis {
     private:
       void ReadLineRates(QString filename);
 
-      std::vector<LineRateChange> p_lineRates; /**< Vector of the variable line rates for this 
+      std::vector<LineRateChange> p_lineRates; /**< Vector of the variable line rates for this
                                                     camera model.*/
   };
 };
diff --git a/isis/src/mex/objs/HrscCamera/unitTest.cpp b/isis/src/mex/objs/HrscCamera/unitTest.cpp
index 6384f9237a9a44611e576e137a982526c107bc9f..f5874cccc5682506563bca54a7fa024ec00be257 100644
--- a/isis/src/mex/objs/HrscCamera/unitTest.cpp
+++ b/isis/src/mex/objs/HrscCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <iomanip>
 #include <iostream>
@@ -35,10 +24,10 @@ void TestLineSamp(Camera *cam, double samp, double line);
 /**
  * @internal
  *   @history 2009-08-03 Jeannie Walldren - Changed known lat and lon.
- *   @history 2009-08-06 Jeannie Walldren - Added cmath include and changed calls to abs() 
+ *   @history 2009-08-06 Jeannie Walldren - Added cmath include and changed calls to abs()
  *                           to fabs() since the abs() function takes integer values while the
- *                           fabs() takes floats. Changed Center Lat tolerance 
- *                           from 4E-10 to 4.1E-10 since the difference on 
+ *                           fabs() takes floats. Changed Center Lat tolerance
+ *                           from 4E-10 to 4.1E-10 since the difference on
  *                           Darwin powerpc was 4.07E-10.
  *   @history 2011-05-03 Jeannie Walldren - Updated unitTest to test for new methods.
  *   @history 2016-10-27 Kristin Berry - Updated known latitude and longitude.  References #4476.
@@ -70,7 +59,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -138,4 +127,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp
index dbd8d86ec6f90ac45944ffd97168b97f580d9b6d..caa66712ef55b74b9b797f96386ea4b3734891f2 100644
--- a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp
+++ b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "MexHrscSrcCamera.h"
 
@@ -39,8 +27,8 @@ namespace Isis {
    *
    * @param lab Pvl label from a Mex HRSC SRC Framing Camera image.
    *
-   * @author Stuart Sides 
-   *  
+   * @author Stuart Sides
+   *
    * @internal
    */
 
@@ -49,7 +37,7 @@ namespace Isis {
     m_instrumentNameShort = "SRC";
     m_spacecraftNameLong = "Mars Express";
     m_spacecraftNameShort = "MEX";
-    
+
     NaifStatus::CheckErrors();
 
     SetFocalLength(Spice::getDouble("INS" + toString(naifIkCode()) + "_FOCAL_LENGTH"));
@@ -70,7 +58,7 @@ namespace Isis {
     // out the affine transforms from detector samp,line to focal plane x,y.
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
 
-    // The boresight position recorded in the IK is zero-based and therefore needs to be adjusted 
+    // The boresight position recorded in the IK is zero-based and therefore needs to be adjusted
     // for ISIS
     double boresightSample = Spice::getDouble("INS" + toString(naifIkCode()) + "_CCD_CENTER",0) + 1.0;
     double boresightLine = Spice::getDouble("INS" + toString(naifIkCode()) + "_CCD_CENTER",1) + 1.0;
@@ -101,7 +89,7 @@ namespace Isis {
 
   /**
    * Returns the shutter open and close times.
-   * 
+   *
    * @param time The SpacecraftClockStartCount converted to ephemeris time.
    * @param exposureDuration ExposureDuration keyword value from the labels, converted to
    *                         seconds.
diff --git a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.h b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.h
index ea62aa707cce43f95fcd97d873c5bc3cd926a357..1237494c44309d41aec3ff14c7c0163feb053a90 100644
--- a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.h
+++ b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.h
@@ -1,24 +1,13 @@
 #ifndef MexHrscSrcCamera_h
 #define MexHrscSrcCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -26,14 +15,14 @@
 
 namespace Isis {
   /**
-   * This is the camera model for the Mex HRSC SRC Framing Camera 
+   * This is the camera model for the Mex HRSC SRC Framing Camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Mex
    *
    * @author 2020-04-02 Stuart Sides
    *
-   * @internal 
+   * @internal
    *   @history 2020-04-01 Stuart Sides - Initial version
 
    */
@@ -45,12 +34,12 @@ namespace Isis {
       //! Destroys the MexHrscSrcCamera object
       ~MexHrscSrcCamera() {};
 
-     /** 
-      * Reimplemented from FrameCamera 
-      *  
+     /**
+      * Reimplemented from FrameCamera
+      *
       * @param time Start time of the observation
       * @param exposureDuration The exposure duration of the observation
-      * 
+      *
       * @return std::pair<iTime,iTime> The start and end times of the observation
       */
       virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
@@ -58,25 +47,25 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-41001); }
 
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp b/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp
index aefc6e1f2e5983372d8e08cbc98739cc4f159610..c2be1189a6e9978a2d3cb55edc159fc0f65b3ddd 100644
--- a/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp
+++ b/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <iomanip>
 #include <iostream>
@@ -34,7 +23,7 @@ using namespace Isis;
 void TestLineSamp(Camera *cam, double samp, double line);
 /**
  * @internal
- *  
+ *
  *   @history 2020-04-09 Stuart Sides - Original version.
  */
 int main(void) {
@@ -62,7 +51,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -130,4 +119,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/mgs/apps/moc2isis/main.cpp b/isis/src/mgs/apps/moc2isis/main.cpp
index e2fd38a21a8dd8473b2438dd92e700578b973567..9472a087f319c0ee1cf901d2477e7dde84cbc1ac 100644
--- a/isis/src/mgs/apps/moc2isis/main.cpp
+++ b/isis/src/mgs/apps/moc2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
@@ -312,4 +320,3 @@ void TranslateMocEdrLabels(FileName &labelFile, Cube *ocube) {
   kerns += PvlKeyword("NaifFrameCode", frameCode);
   ocube->putGroup(kerns);
 }
-
diff --git a/isis/src/mgs/apps/moccal/main.cpp b/isis/src/mgs/apps/moccal/main.cpp
index f1552b67fdc7c0639ffd6214bfd3f295f791fb5a..52b449d8cb610dab0f3a52a5e984550fc114fa76 100644
--- a/isis/src/mgs/apps/moccal/main.cpp
+++ b/isis/src/mgs/apps/moccal/main.cpp
@@ -1,21 +1,11 @@
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "SpecialPixel.h"
diff --git a/isis/src/mgs/apps/mocevenodd/main.cpp b/isis/src/mgs/apps/mocevenodd/main.cpp
index f5ae0e780c3c479e965a9730be06639d3835920e..73f97e40938503249238b5fdf1a22c16fcbd8800 100644
--- a/isis/src/mgs/apps/mocevenodd/main.cpp
+++ b/isis/src/mgs/apps/mocevenodd/main.cpp
@@ -1,21 +1,11 @@
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 //
 //    mocevenodd.cpp
 //
@@ -139,4 +129,3 @@ void applyCorrectionOffset(Buffer &in, Buffer &out) {
     odd = !odd;
   }
 }
-
diff --git a/isis/src/mgs/apps/mocgap/main.cpp b/isis/src/mgs/apps/mocgap/main.cpp
index c024e5d9a591cc011b246a62fa02b6015692b7ee..55d8099624806c75da021f70f2c2075083fccb1f 100644
--- a/isis/src/mgs/apps/mocgap/main.cpp
+++ b/isis/src/mgs/apps/mocgap/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "Statistics.h"
diff --git a/isis/src/mgs/apps/mocnoise50/main.cpp b/isis/src/mgs/apps/mocnoise50/main.cpp
index 8b01d1716fdd0a1149472abf08ab27774db06ab5..15e93458e7c51001d7c392e61799b83c9d537a0d 100644
--- a/isis/src/mgs/apps/mocnoise50/main.cpp
+++ b/isis/src/mgs/apps/mocnoise50/main.cpp
@@ -1,21 +1,11 @@
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "SpecialPixel.h"
diff --git a/isis/src/mgs/apps/mocproc/main.cpp b/isis/src/mgs/apps/mocproc/main.cpp
index 6aca4d6282e80fc9d14369a0e1d346620c838494..3f9b3836ddb74436bf0808347ea9799f7ef0877a 100644
--- a/isis/src/mgs/apps/mocproc/main.cpp
+++ b/isis/src/mgs/apps/mocproc/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QString>
diff --git a/isis/src/mgs/objs/MocLabels/MocLabels.cpp b/isis/src/mgs/objs/MocLabels/MocLabels.cpp
index c6fcfe132ab275a0343f5c19959a3af605bfe779..b35efa4d38b449b290b19f9e23215260ccd8aea6 100644
--- a/isis/src/mgs/objs/MocLabels/MocLabels.cpp
+++ b/isis/src/mgs/objs/MocLabels/MocLabels.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MocLabels.h"
 
 #include <cmath>
@@ -597,4 +605,3 @@ namespace Isis {
     unload_c(sclkKern.toLatin1().data());
   }
 }
-
diff --git a/isis/src/mgs/objs/MocLabels/MocLabels.h b/isis/src/mgs/objs/MocLabels/MocLabels.h
index eadc5c5c2deb481e82d605efe37b14976a561ef8..43717e8e6e987724f7a4cbd0bcece8ec24f9bc0d 100644
--- a/isis/src/mgs/objs/MocLabels/MocLabels.h
+++ b/isis/src/mgs/objs/MocLabels/MocLabels.h
@@ -1,26 +1,13 @@
 #ifndef MocLabels_h
 #define MocLabels_h
-/**
- * @file
- * $Revision: 1.8 $
- * $Date: 2010/01/05 20:56:07 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <map>
 #include <vector>
@@ -39,8 +26,8 @@ namespace Isis {
    *
    *
    * @ingroup SpiceInstrumentsAndCameras
-   * @ingroup MarsGlobalSurveyor 
-   *  
+   * @ingroup MarsGlobalSurveyor
+   *
    * @author 2007-01-30 Author Unknown
    *
    * @internal
diff --git a/isis/src/mgs/objs/MocLabels/mocxtrack.h b/isis/src/mgs/objs/MocLabels/mocxtrack.h
index 33128a61e2d2324525e4ba8b3ea59b2156910200..fd4228cebc0d2fc5d91f97175da83d9e90daac21 100644
--- a/isis/src/mgs/objs/MocLabels/mocxtrack.h
+++ b/isis/src/mgs/objs/MocLabels/mocxtrack.h
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 /***********************************************************************
 *_Title mocxtrack.h - MOC Cross Track Summing table maps
 *_Args NONE
diff --git a/isis/src/mgs/objs/MocLabels/unitTest.cpp b/isis/src/mgs/objs/MocLabels/unitTest.cpp
index 320a1eadf4d366af61425eb697152c18fc682911..7b79d32f9e4ed5a212b8521edab264c755e3bb45 100644
--- a/isis/src/mgs/objs/MocLabels/unitTest.cpp
+++ b/isis/src/mgs/objs/MocLabels/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "IException.h"
 #include "Pvl.h"
@@ -63,4 +71,3 @@ int main() {
     e.print();
   }
 }
-
diff --git a/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.cpp b/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.cpp
index 18e481fe56ae5e74dd1fa70110e68c57c81af84e..1b3abdeb57c74b71e55bf5d8a70af87dc50cf5cc 100644
--- a/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.cpp
+++ b/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MocNarrowAngleCamera.h"
 
 #include <QString>
@@ -36,7 +25,7 @@ namespace Isis {
   /**
    * Constructor for the Mgs MOC Narrow Angle Camera Model
    *
-   * @param lab Pvl label from an MOC NAC image. 
+   * @param lab Pvl label from an MOC NAC image.
    *
    * @internal
    *   @history 2011-05-03 Jeannie Walldren - Added NAIF error check.
@@ -46,7 +35,7 @@ namespace Isis {
     m_instrumentNameShort = "MOC-NA";
     m_spacecraftNameLong = "Mars Global Surveyor";
     m_spacecraftNameShort = "MGS";
-    
+
     NaifStatus::CheckErrors();
     // Set up the camera info from ik/iak kernels
     //      LoadEulerMounting();
@@ -94,7 +83,7 @@ namespace Isis {
 
 
 /**
- * This is the function that is called in order to instantiate a MocNarrowAngleCamera object. 
+ * This is the function that is called in order to instantiate a MocNarrowAngleCamera object.
  *
  * @param lab Cube labels
  *
diff --git a/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.h b/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.h
index 9ccd812c5e0481542a7a23663be12a33a75124e0..b22c111cf8b0da523222dcf7ed38008789ff2730 100644
--- a/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.h
+++ b/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.h
@@ -1,25 +1,13 @@
 #ifndef MocNarrowAngleCamera_h
 #define MocNarrowAngleCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -27,8 +15,8 @@ namespace Isis {
   /**
    * @brief MOC Narrow Angle Camera Model
    *
-   * This is the camera model for the Mars Global Surveyor MOC narrow angle 
-   * camera. 
+   * This is the camera model for the Mars Global Surveyor MOC narrow angle
+   * camera.
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup MarsGlobalSurveyor
@@ -46,12 +34,12 @@ namespace Isis {
    *                           for new methods. Updated documentation. Removed Mgs namespace
    *                           wrap inside Isis namespace. Added Isis Disclaimer to files.
    *                           Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -64,23 +52,23 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-94000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/mgs/objs/MocNarrowAngleCamera/unitTest.cpp b/isis/src/mgs/objs/MocNarrowAngleCamera/unitTest.cpp
index 46d515208bd7da6d30a8ed3372ae02117d8184d5..dce8f2d4d4554ea34ab8efdd24abba8734d0c163 100644
--- a/isis/src/mgs/objs/MocNarrowAngleCamera/unitTest.cpp
+++ b/isis/src/mgs/objs/MocNarrowAngleCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <iomanip>
 #include <iostream>
@@ -48,7 +37,7 @@ void TestLineSamp(Camera *cam, double samp, double line);
  *                           in accordence with the system changes
  *   @history 2011-05-03 Jeannie Walldren - Updated unitTest to test
  *                           for new methods. Added Isis Disclaimer to file.
- *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added tests for spacecraft and 
+ *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added tests for spacecraft and
  *                           instrument name methods.
  */
 
@@ -122,7 +111,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -155,4 +144,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/mgs/objs/MocNarrowAngleSumming/MocNarrowAngleSumming.h b/isis/src/mgs/objs/MocNarrowAngleSumming/MocNarrowAngleSumming.h
index 61d5c19630cd03a302aadb40ec8637a19b07f7a4..deddf545bd6e8758ea85ccfda41abd2eed701efc 100644
--- a/isis/src/mgs/objs/MocNarrowAngleSumming/MocNarrowAngleSumming.h
+++ b/isis/src/mgs/objs/MocNarrowAngleSumming/MocNarrowAngleSumming.h
@@ -1,27 +1,17 @@
 #ifndef MocNarrowAngleSumming_h
 #define MocNarrowAngleSumming_h
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 namespace Isis {
   /**
-   * Mars Global Surveyor MOC narrow angle summing class. 
+   * Mars Global Surveyor MOC narrow angle summing class.
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup MarsGlobalSurveyor
@@ -35,10 +25,10 @@ namespace Isis {
    */
   class MocNarrowAngleSumming {
     public:
-      /** 
-       * Constructs the MocNarrowAngleSumming object 
-       * @param csum 
-       * @param ss 
+      /**
+       * Constructs the MocNarrowAngleSumming object
+       * @param csum
+       * @param ss
        */
       MocNarrowAngleSumming(int csum, int ss) {
         p_csum = csum;
@@ -49,19 +39,19 @@ namespace Isis {
       ~MocNarrowAngleSumming() {};
 
       /**
-       * Given the sample value, this method computes the corresponding 
-       * detector. 
-       * @param sample 
+       * Given the sample value, this method computes the corresponding
+       * detector.
+       * @param sample
        * @return @b double Detector
        */
       inline double Detector(double sample) const {
         return (sample - 1.0) * (double) p_csum + p_ss;
       }
 
-      /** 
-       * Given the detector value, this method computes the corresponding 
-       * sample. 
-       * @param detector 
+      /**
+       * Given the detector value, this method computes the corresponding
+       * sample.
+       * @param detector
        * @return @b double Sample
        */
       inline double Sample(double detector) const {
diff --git a/isis/src/mgs/objs/MocNarrowAngleSumming/unitTest.cpp b/isis/src/mgs/objs/MocNarrowAngleSumming/unitTest.cpp
index abcd3a631eaf4fd9ef2dca705f8e063f343d01fb..c37e0ca2bfccdb14b7b9c24876f8286c89cdb05a 100644
--- a/isis/src/mgs/objs/MocNarrowAngleSumming/unitTest.cpp
+++ b/isis/src/mgs/objs/MocNarrowAngleSumming/unitTest.cpp
@@ -1,21 +1,11 @@
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 #include <iomanip>
 
@@ -58,4 +48,3 @@ int main(int argc, char *argv[]) {
   cout << s3.Sample(s3.Detector(2.0)) << endl;
   cout << s3.Sample(s3.Detector(3.0)) << endl;
 }
-
diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.cpp b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.cpp
index adba9d4509cd21a1a561f096e0b20ce28bb5a81a..27676250540488621f01934481b7b3fd03d4af9e 100644
--- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.cpp
+++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MocWideAngleCamera.h"
 #include "MocWideAngleDetectorMap.h"
 #include "MocWideAngleDistortionMap.h"
@@ -50,7 +39,7 @@ namespace Isis {
     m_instrumentNameShort = "MOC-WA";
     m_spacecraftNameLong = "Mars Global Surveyor";
     m_spacecraftNameShort = "MGS";
-    
+
     NaifStatus::CheckErrors();
     // See if we have a moc camera
     Pvl &lab = *cube.label();
diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.h b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.h
index 57cd8d31062d5f9980bcdc68c757979a5b112a8e..40768690465742b0065afafb84df4fa089d63b80 100644
--- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.h
+++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.h
@@ -1,25 +1,13 @@
 #ifndef MocWideAngleCamera_h
 #define MocWideAngleCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -27,7 +15,7 @@ namespace Isis {
   /**
    * @brief MOC Wide Angle Camera Model
    *
-   * This is the camera model for the Mars Global Surveyor MOC wide angle 
+   * This is the camera model for the Mars Global Surveyor MOC wide angle
    * camera.
    *
    * @ingroup SpiceInstrumentsAndCameras
@@ -50,12 +38,12 @@ namespace Isis {
    *                           for new methods. Updated documentation. Removed Mgs namespace
    *                           wrap inside Isis namespace. Added Isis Disclaimer to files.
    *                           Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -69,23 +57,23 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-94000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.cpp b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.cpp
index aab474155b38a611775a93058302a597ca5a8a09..65f2c1b08edc16886c603570ab731571eb66cbcc 100644
--- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.cpp
+++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MocWideAngleDetectorMap.h"
 
 using namespace std;
@@ -49,10 +38,10 @@ namespace Isis {
 
 
   /**
-   * @param sample 
-   * @param line 
-   *  
-   * @return @b bool 
+   * @param sample
+   * @param line
+   *
+   * @return @b bool
    */
   bool MocWideAngleDetectorMap::SetParent(const double sample,
                                           const double line) {
@@ -86,4 +75,3 @@ namespace Isis {
     return true;
   }
 }
-
diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.h b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.h
index c58b9ea9c860b96d899cf1c62598f1898aa33a88..16c54ec6b07272011640987aaa227459a223650d 100644
--- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.h
+++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.h
@@ -1,25 +1,13 @@
 #ifndef MocWideAngleDetectorMap_h
 #define MocWideAngleDetectorMap_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCameraDetectorMap.h"
 #include "MocLabels.h"
@@ -36,7 +24,7 @@ namespace Isis {
    *
    * @see Camera
    *
-   * @author 2005-02-01 Jeff Anderson 
+   * @author 2005-02-01 Jeff Anderson
    * @internal
    *   @history 2005-02-01 Jeff Anderson - Original version
    *   @history 2011-05-03 Jeannie Walldren - Removed Mgs namespace wrap.
diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.cpp b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.cpp
index 41a795453df8b3c3baa7bc1b82b42f2bba6998f8..da51ace630877d44c8c415b2bbebf38993e5de02 100644
--- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.cpp
+++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MocWideAngleDistortionMap.h"
 
 using namespace std;
diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.h b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.h
index 966678b9de26cdc59953e4b7d5b0521747fb7376..0af249cd1008c4725ce551c19ef476b620b42ee8 100644
--- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.h
+++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.h
@@ -1,31 +1,19 @@
 #ifndef MocWideAngleDistortionMap_h
 #define MocWideAngleDistortionMap_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 #include "CameraDistortionMap.h"
 
 namespace Isis {
-  /** 
+  /**
    *  Distort/undistort focal plane coordinates
    *
    * Creates a map for adding/removing optical distortions
@@ -35,8 +23,8 @@ namespace Isis {
    * @ingroup MarsGlobalSurveyor
    *
    * @see Camera
-   *  
-   * @author 2005-02-01 Jeff Anderson 
+   *
+   * @author 2005-02-01 Jeff Anderson
    * @internal
    *   @history 2005-02-01 Jeff Anderson - Original version
    *   @history 2011-05-03 Jeannie Walldren - Removed Mgs namespace wrap.
diff --git a/isis/src/mgs/objs/MocWideAngleCamera/unitTest.cpp b/isis/src/mgs/objs/MocWideAngleCamera/unitTest.cpp
index e7657489516a794523dc1158f0acb7e9742c1194..87f0deb7f34b1436ae43950fd6bebc9cb900f1a4 100644
--- a/isis/src/mgs/objs/MocWideAngleCamera/unitTest.cpp
+++ b/isis/src/mgs/objs/MocWideAngleCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <iomanip>
 #include <iostream>
@@ -111,7 +100,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Test name methods
     cout << endl << endl << "Test name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -144,4 +133,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/mro/apps/crism2isis/crism2isis.cpp b/isis/src/mro/apps/crism2isis/crism2isis.cpp
index 89e17c7aaebc03bc26ad9f8c699f5dc8114c03e5..d81a1ff1f19152c90f600e84652f2ee4ae16fc49 100644
--- a/isis/src/mro/apps/crism2isis/crism2isis.cpp
+++ b/isis/src/mro/apps/crism2isis/crism2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "crism2isis.h"
 #include "ProcessImportPds.h"
 #include "UserInterface.h"
diff --git a/isis/src/mro/apps/crism2isis/crism2isis.h b/isis/src/mro/apps/crism2isis/crism2isis.h
index 670f284e9ddcbc418d19e60fb6a0690c51bd0786..845f923fdaf6f3ee2696623385441e5d405bb78b 100644
--- a/isis/src/mro/apps/crism2isis/crism2isis.h
+++ b/isis/src/mro/apps/crism2isis/crism2isis.h
@@ -1,6 +1,14 @@
 #ifndef crism2isis_h
 #define crism2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/mro/apps/crism2isis/main.cpp b/isis/src/mro/apps/crism2isis/main.cpp
index 022ac7dc8970117e7391171ed9456afffe996809..45d151f179edb3854bcb7f4fae85682249b651e2 100644
--- a/isis/src/mro/apps/crism2isis/main.cpp
+++ b/isis/src/mro/apps/crism2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
diff --git a/isis/src/mro/apps/ctxcal/main.cpp b/isis/src/mro/apps/ctxcal/main.cpp
index c3a812282bef1553a5631db36117425e8b2d4c46..430cde041b4cd972c6bbe6af3654fd1850771c8c 100644
--- a/isis/src/mro/apps/ctxcal/main.cpp
+++ b/isis/src/mro/apps/ctxcal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "SpecialPixel.h"
diff --git a/isis/src/mro/apps/ctxevenodd/main.cpp b/isis/src/mro/apps/ctxevenodd/main.cpp
index d8745a03e3ee7cf409f4484ed529b85570c508e7..66adce37b023b075b1396161b961f357f80e37b0 100644
--- a/isis/src/mro/apps/ctxevenodd/main.cpp
+++ b/isis/src/mro/apps/ctxevenodd/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 //
 //    ctxevenodd.cpp
 //
@@ -132,4 +140,3 @@ void applyCorrectionOffset(Buffer &in, Buffer &out) {
     odd = !odd;
   }
 }
-
diff --git a/isis/src/mro/apps/hi2isis/main.cpp b/isis/src/mro/apps/hi2isis/main.cpp
index 0f01773f4bd26c707da52805a9a2bd8cf78ed578..6eeddc97a4a2d77c13e7f21f44009b1b82a41935 100644
--- a/isis/src/mro/apps/hi2isis/main.cpp
+++ b/isis/src/mro/apps/hi2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
diff --git a/isis/src/mro/apps/hical/main.cpp b/isis/src/mro/apps/hical/main.cpp
index 70eeb27e1501fa8bccedb1652998b7b93545cd60..aba30d0c877a188c84a2f6d6ef70dc949bff0479 100644
--- a/isis/src/mro/apps/hical/main.cpp
+++ b/isis/src/mro/apps/hical/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 //  $Id: hical.cpp 6715 2016-04-28 17:58:43Z tsucharski@GS.DOI.NET $
 #include "Isis.h"
 
@@ -482,4 +490,3 @@ void IsisMain(){
   delete calVars;
   calVars = 0;
 }
-
diff --git a/isis/src/mro/apps/hicalbeta/main.cpp b/isis/src/mro/apps/hicalbeta/main.cpp
index 7ef97d1889f2d5e990a6d3fbe3a944aa608e4667..37a0fefd4962f613d19a0dc1720251aa42a1a3a3 100644
--- a/isis/src/mro/apps/hicalbeta/main.cpp
+++ b/isis/src/mro/apps/hicalbeta/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 //  $Id: hicalbeta.cpp,v 1.14 2009/09/15 21:56:44 kbecker Exp $
 #include "Isis.h"
 
@@ -482,4 +490,3 @@ void IsisMain(){
   delete calVars;
   calVars = 0;
 }
-
diff --git a/isis/src/mro/apps/hicalproc/main.cpp b/isis/src/mro/apps/hicalproc/main.cpp
index 205c8ac0323da015ec66836d267645af2b76c517..161092d1725df82319cf7b41df9b0fc6e5c3e1c7 100644
--- a/isis/src/mro/apps/hicalproc/main.cpp
+++ b/isis/src/mro/apps/hicalproc/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "IException.h"
 
@@ -625,4 +633,3 @@ void AnalyzeCubenormStats(QString psStatsFile, int piSumming, double & pdMinDN,
   cerr << "MinDN=" << pdMinDN << "   MaxDN=" << pdMaxDN << endl;
 #endif
 }
-
diff --git a/isis/src/mro/apps/hiccdstitch/main.cpp b/isis/src/mro/apps/hiccdstitch/main.cpp
index 6ef430b79c5989badbf6d839ecc7c5def741a3bb..e94684f11657240ca41546ed22e57f6455e45925 100644
--- a/isis/src/mro/apps/hiccdstitch/main.cpp
+++ b/isis/src/mro/apps/hiccdstitch/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #define GUIHELPERS
 
 #include "Isis.h"
@@ -524,4 +532,3 @@ void helperButtonLog() {
   Application::GuiLog(p);
 }
 //...........end of helper function ........
-
diff --git a/isis/src/mro/apps/hicolormos/hicolormos.cpp b/isis/src/mro/apps/hicolormos/hicolormos.cpp
index dd0b93a3e80c026c7d8f3944e6d3253501f36120..f0f9c583b4d789a4e17cb747546e2939f66e243b 100644
--- a/isis/src/mro/apps/hicolormos/hicolormos.cpp
+++ b/isis/src/mro/apps/hicolormos/hicolormos.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Camera.h"
 #include "CameraFactory.h"
 #include "Cube.h"
@@ -26,7 +34,7 @@ void hicolormos(UserInterface &ui) {
   if (ui.WasEntered("FROM2")) {
     Cube from2(ui.GetFileName("FROM2"), "r");
     hicolormos(&from1, &from2, ui);
-  } 
+  }
   else {
     hicolormos(&from1, nullptr, ui);
   }
@@ -50,9 +58,9 @@ void hicolormos(Cube *from1, Cube* from2, UserInterface &ui) {
   // Prep for second image if we have one
   Pvl from2lab;
   PvlGroup from2Mosaic("Mosaic");
-  
+
   if (from2) {
-    from2lab = *from2->label(); 
+    from2lab = *from2->label();
     tf.PutLine(from2->fileName() + "\n");
 
     // Test the observation ID between from1 and from2
@@ -64,12 +72,12 @@ void hicolormos(Cube *from1, Cube* from2, UserInterface &ui) {
 
     from2Mosaic = from2lab.findGroup("Mosaic", Pvl::Traverse);
   }
-  
+
   tf.Close();  // Close list remember to delete
 
   // Make the source product ID (from1 mosaic group)
   PvlKeyword sourceProductId = from1Mosaic["SourceProductId"];
-  
+
   if(from2) {
     // Add source product Id for from2
     PvlKeyword from2SPI =  from2Mosaic["SourceProductId"];
@@ -277,4 +285,4 @@ void hicolormos(Cube *from1, Cube* from2, UserInterface &ui) {
 } // end of isis main
 
 
-}
\ No newline at end of file
+}
diff --git a/isis/src/mro/apps/hicolormos/hicolormos.h b/isis/src/mro/apps/hicolormos/hicolormos.h
index 3ac2e95d838aa06974054cd499890001c584d713..8f8bfb572d6d528995b6b82079da8feab0f30cd9 100644
--- a/isis/src/mro/apps/hicolormos/hicolormos.h
+++ b/isis/src/mro/apps/hicolormos/hicolormos.h
@@ -1,6 +1,14 @@
-#ifndef hicolormos_h 
+#ifndef hicolormos_h
 #define hicolormos_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "UserInterface.h"
 
@@ -9,4 +17,4 @@ namespace Isis{
   extern void hicolormos(UserInterface &ui);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/isis/src/mro/apps/hicolormos/main.cpp b/isis/src/mro/apps/hicolormos/main.cpp
index 96184b34ab855a8090c66f0c9f1220414c167d07..124eedc5d1b12b7be7bc11be53631ed2bfd992aa 100644
--- a/isis/src/mro/apps/hicolormos/main.cpp
+++ b/isis/src/mro/apps/hicolormos/main.cpp
@@ -1,11 +1,19 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
-#include "hicolormos.h" 
+#include "hicolormos.h"
 
 using namespace Isis;
 
 void IsisMain() {
   UserInterface &ui = Application::GetUserInterface();
   hicolormos(ui);
-}
\ No newline at end of file
+}
diff --git a/isis/src/mro/apps/hicrop/hicrop.cpp b/isis/src/mro/apps/hicrop/hicrop.cpp
index 8e26c2d53496686486aeee566667ccf55b0caee4..c3933b1b2bb07d4cb2cf7c55f075cc6de432f618 100644
--- a/isis/src/mro/apps/hicrop/hicrop.cpp
+++ b/isis/src/mro/apps/hicrop/hicrop.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // Qt library includes
 #include <QtCore/qmath.h>
 #include <QString>
@@ -29,10 +37,10 @@ namespace Isis {
 
   // start process by line method
   void crop(Buffer &out);
-  // methods for converting between label clock count times and actual times 
-  iTime actualTime(iTime timeFromInputClockCount, double tdiMode, 
+  // methods for converting between label clock count times and actual times
+  iTime actualTime(iTime timeFromInputClockCount, double tdiMode,
                    double unbinnedRate, double binMode);
-  iTime labelClockCountTime(iTime actualCalculatedTime, double tdiMode, 
+  iTime labelClockCountTime(iTime actualCalculatedTime, double tdiMode,
                             double unbinnedRate, double binMode);
   pair<double, double> ckBeginEndTimes(IString ckFileName);
   // methods for converting between lines/times/clock counts
@@ -42,16 +50,16 @@ namespace Isis {
   iTime clock2time(QString spacecraftClockCount);
   // method to validate calculated or user-entered cropped line and time values
   void validateCropLines();
-  void validateCropTimes(double cropStart, double  cropStop, 
-                         double ckFirstTime, double ckLastTime); 
-  
+  void validateCropTimes(double cropStart, double  cropStop,
+                         double ckFirstTime, double ckLastTime);
+
   // declare and initialize global variables needed in crop method.
   LineManager *g_in = NULL;
-  Cube *g_cube = NULL; 
+  Cube *g_cube = NULL;
   int g_cropStartLine = 0;
   int g_cropEndLine = 0;
   int g_cropLineCount = 0;
-  
+
   void hicrop(UserInterface &ui, Pvl *log) {
     QString inputFileName = ui.GetFileName("FROM");
     CubeAttributeInput inAtt(inputFileName);
@@ -59,25 +67,25 @@ namespace Isis {
     g_cube->setVirtualBands(inAtt.bands());
     inputFileName = ui.GetFileName("FROM");
     g_cube->open(inputFileName);
-    
+
     hicrop(g_cube, ui, log);
-    delete g_cube; 
+    delete g_cube;
     g_cube = NULL;
   }
-  
+
   void hicrop(Cube *cube, UserInterface &ui, Pvl *log) {
     //   Isis::Preference::Preferences(true); // delete ???
     cout << setprecision(25);// ???
 
-    g_cube = cube; 
+    g_cube = cube;
     QString inputFileName = g_cube->fileName();
     // get user inputs for input cube and open
     try {
-  
-      // read kernel files and furnish these kernels for naif routines used in 
+
+      // read kernel files and furnish these kernels for naif routines used in
       // originalStartTime() and time2clock()
       IString ckFileName = ui.GetFileName("CK");
-  
+
       IString lskFileName = "";
       if (ui.WasEntered("LSK")) {
         lskFileName = ui.GetFileName("LSK");
@@ -86,7 +94,7 @@ namespace Isis {
         FileName lskFile("$base/kernels/lsk/naif????.tls");
         lskFileName = lskFile.highestVersion().expanded();
       }
-  
+
       IString sclkFileName = "";
       if (ui.WasEntered("SCLK")) {
         sclkFileName = ui.GetFileName("SCLK");
@@ -95,7 +103,7 @@ namespace Isis {
         FileName sclkFile("$mro/kernels/sclk/MRO_SCLKSCET.?????.65536.tsc");
         sclkFileName = sclkFile.highestVersion().expanded();
       }
-  
+
       // furnish these kernels
       NaifStatus::CheckErrors();
       furnsh_c(ckFileName.c_str());
@@ -104,7 +112,7 @@ namespace Isis {
       NaifStatus::CheckErrors();
       furnsh_c(lskFileName.c_str());
       NaifStatus::CheckErrors();
-  
+
       // get values from the labels needed to compute the line rate and the
       // actual start time of the input cube
       Pvl &inLabels = *g_cube->label();
@@ -119,19 +127,19 @@ namespace Isis {
       QString labelStartClockCount = inputInst["SpacecraftClockStartCount"];
       double binMode = inputInst["Summing"];
       double deltaLineTimerCount = inputInst["DeltaLineTimerCount"];
-  
+
       // Compute the line rate using the product of the
       // unbinned line rate (converted to seconds) and the downtrack summing
       double unbinnedRate = (74.0 + (deltaLineTimerCount / 16.0)) / 1000000.0;
       double lineRate = unbinnedRate * binMode;
-  
+
       // get the actual original start time by making adjustments to the
       // spacecraft clock start count in the labels
       iTime timeFromLabelClockCount = clock2time(labelStartClockCount);
-      iTime originalStart = actualTime(timeFromLabelClockCount, tdiMode, 
+      iTime originalStart = actualTime(timeFromLabelClockCount, tdiMode,
                                        unbinnedRate, binMode);
       double originalStartEt = originalStart.Et();
-       
+
       pair<double, double> ckCoverage = ckBeginEndTimes(ckFileName);
       // find the values of the first and last lines to be kept from user inputs
       if (ui.GetString("SOURCE") == "LINEVALUES") {
@@ -180,37 +188,37 @@ namespace Isis {
           firstValidTime = ckCoverage.first;
           lastValidTime = ckCoverage.second;
         }
-        validateCropTimes(firstValidTime, lastValidTime, 
+        validateCropTimes(firstValidTime, lastValidTime,
                           ckCoverage.first, ckCoverage.second);
-  
+
         // to get the integer value of the start line, we will always round up
         if (originalStartEt > firstValidTime) {
           g_cropStartLine = 1;
         }
         else {
-          // get the exact line number associated with this time and find its 
+          // get the exact line number associated with this time and find its
           // decimal value.
           double startTime2Line = et2line(firstValidTime, lineRate, originalStartEt);
           double decimalValue = startTime2Line - qFloor(startTime2Line);
-          // notice that for each line, n, it covers times corresponding to the 
+          // notice that for each line, n, it covers times corresponding to the
           // exact line values that are between (n-1)+0.5 and n+0.5
-          // we need to be sure that the entire first line has coverage, 
+          // we need to be sure that the entire first line has coverage,
           if (decimalValue <= 0.5) {
             // if the decimal value is between 0 and 0.5, the time corresponds to
-            // the second half of the nth line, from n to n+0.5. 
-            // round up to the next line number since the first half of the 
-            // nth line is not covered 
+            // the second half of the nth line, from n to n+0.5.
+            // round up to the next line number since the first half of the
+            // nth line is not covered
             g_cropStartLine = qCeil(startTime2Line);
           }
           else {
-            // if the decimal value is above 0.5, the time corresponds to the 
-            // first half of the nth line from (n-1)+0.5 to n. 
-            // round up to get the nth line and add 1 since the nth line is not 
+            // if the decimal value is above 0.5, the time corresponds to the
+            // first half of the nth line from (n-1)+0.5 to n.
+            // round up to get the nth line and add 1 since the nth line is not
             // entirely covered
             g_cropStartLine = qCeil(startTime2Line) + 1;
           }
         }
-  
+
         // Now, to get the integer value of the end line, always round down.
         // Get the exact line number associated with this time and find its
         // decimal value.
@@ -224,7 +232,7 @@ namespace Isis {
           if (decimalValue >= 0.5) {
             // if the decimal value is above 0.5, the time corresponds to the
             // first half of the nth line.  Round down to the previous line
-            // since the second half of this line is not covered 
+            // since the second half of this line is not covered
             g_cropEndLine = qFloor(stopTime2Line);
           }
           else {
@@ -234,30 +242,30 @@ namespace Isis {
             g_cropEndLine = qFloor(stopTime2Line) - 1;
           }
         }
-  
+
       }
-  
+
       g_cropLineCount = (g_cropEndLine - g_cropStartLine + 1);
-  
+
       // The following error check has been commented out since it is redundant.
       // Error should be caught when the validateCropTimes() method is called.
       // validateCropLines();
-      
-      // update start and stop times of the cropped image based on the 
+
+      // update start and stop times of the cropped image based on the
       // the first and last line values that will be kept.
       // subtract 0.5 to get the time at the beginning of the first line
-      iTime cropStartTime = line2time((double) g_cropStartLine - 0.5, 
+      iTime cropStartTime = line2time((double) g_cropStartLine - 0.5,
                                       lineRate, originalStartEt);
       // add 0.5 to get the time at the end of the last line
-      iTime cropStopTime = line2time((double) g_cropEndLine + 0.5, 
+      iTime cropStopTime = line2time((double) g_cropEndLine + 0.5,
                                      lineRate, originalStartEt);
-      validateCropTimes(cropStartTime.Et(), cropStopTime.Et(), 
+      validateCropTimes(cropStartTime.Et(), cropStopTime.Et(),
                         ckCoverage.first, ckCoverage.second);
-  
+
       // HiRise spacecraft clock format is P/SSSSSSSSSS:FFFFF
       IString actualCropStartClockCount = time2clock(cropStartTime);//???
       IString actualCropStopClockCount = time2clock(cropStopTime); //???
-  
+
   //???
    // UTC
    // cout << "labelStartClock2time = " << timeFromLabelClockCount.UTC() << endl;
@@ -265,29 +273,29 @@ namespace Isis {
    // cout << "cropped starttime = " << cropStartTime.UTC() << endl;
    // cout << "cropped stoptime = " << cropStopTime.UTC() << endl;
    // cout << "time at 80000.5 = " << line2time(80000.5, lineRate, originalStartEt).UTC() << endl << endl;
-   // 
+   //
    // // ET
-   // cout << "labelStartClockEt = " << timeFromLabelClockCount.Et() << endl;// should this be 
-   // cout << "adjustedStartClockEt = " << originalStartEt << endl;// should this be 
+   // cout << "labelStartClockEt = " << timeFromLabelClockCount.Et() << endl;// should this be
+   // cout << "adjustedStartClockEt = " << originalStartEt << endl;// should this be
    // cout << "cropped starttime = " << cropStartTime.Et() << endl;//??? 264289109.970381856
    // cout << "cropped stoptime = " << cropStopTime.Et() << endl;//??? 264289117.285806835
    // cout << "time at 80000.5 = " << line2time(80000.5, lineRate, originalStartEt).Et() << endl << endl;
-   
-  
+
+
       // readjust the time to get the appropriate label value for the
       // spacecraft clock start count for the labels of the cropped cube
-      iTime adjustedCropStartTime = labelClockCountTime(cropStartTime, tdiMode, 
+      iTime adjustedCropStartTime = labelClockCountTime(cropStartTime, tdiMode,
                                                         unbinnedRate, binMode);
       QString adjustedCropStartClockCount = time2clock(adjustedCropStartTime);
-      iTime adjustedCropStopTime = labelClockCountTime(cropStopTime, tdiMode, 
+      iTime adjustedCropStopTime = labelClockCountTime(cropStopTime, tdiMode,
                                                        unbinnedRate, binMode);
       QString adjustedCropStopClockCount = time2clock(adjustedCropStopTime);
-  
-  
-  
+
+
+
   //???    string stopClockCount = inputInst["SpacecraftClockStopCount"];
   //???    iTime labelStopTime = clock2time(stopClockCount);
-  //???    iTime origStop = actualTime(labelStopTime, tdiMode, 
+  //???    iTime origStop = actualTime(labelStopTime, tdiMode,
   //???                                unbinnedRate, binMode);
   //???    double endline = et2line(origStop.Et(),  lineRate,  originalStartEt);
   //???    cout << std::setprecision(20);
@@ -302,8 +310,8 @@ namespace Isis {
   //???    cout << "Actual Stop Count = " << actualCropStopClockCount << endl;
   //???    cout << "Label Stop Time   = " << adjustedCropStopTime.Et() << endl;
   //???    cout << "Label Stop Count  = " << adjustedCropStopClockCount << endl;
-  
-  
+
+
       // Allocate the output file and make sure things get propogated nicely
       ProcessByLine p;
       p.SetInputCube(g_cube);
@@ -311,25 +319,25 @@ namespace Isis {
       int numSamps = g_cube->sampleCount();
       int numBands = g_cube->bandCount();
       int inputLineCount = g_cube->lineCount();
-      
+
       Isis::CubeAttributeOutput atts = ui.GetOutputAttribute("TO");
       FileName outFileName = ui.GetFileName("TO");
       Cube *ocube = p.SetOutputCube(outFileName.expanded(), atts, numSamps, g_cropLineCount, numBands);
-      
+
       p.ClearInputCubes();
       // Loop through the labels looking for object = Table
       for (int labelObj = 0; labelObj < inLabels.objects(); labelObj++) {
         PvlObject &obj = inLabels.object(labelObj);
-  
+
         if (obj.name() != "Table") continue;
-  
+
         // Read the table into a table object
         Table table(obj["Name"], inputFileName);
-  
+
         // Write the table
         ocube->write(table);
       }
-  
+
       // test to see what happens if I don't have this code ???
       Pvl &outLabels = *ocube->label();
       // Change the start/end times and spacecraft start/stop counts in the labels
@@ -338,12 +346,12 @@ namespace Isis {
       outputInst["StopTime"][0] = cropStopTime.UTC(); // adjustedCropStopTime ???
       outputInst["SpacecraftClockStartCount"][0] = adjustedCropStartClockCount;
       outputInst["SpacecraftClockStopCount"][0] = adjustedCropStopClockCount;
-  
+
       // Create a buffer for reading the input cube
       // Crop the input cube
       g_in = new LineManager(*g_cube);
       p.StartProcess(crop);
-  
+
       // Construct a label with the results
       PvlGroup results("Results");
       results += PvlKeyword("InputLines", toString(inputLineCount));
@@ -355,18 +363,18 @@ namespace Isis {
       results += PvlKeyword("OututStopTime", cropStopTime.UTC()); //??? adjustedCropStopTime
       results += PvlKeyword("OututStartClock", adjustedCropStartClockCount);
       results += PvlKeyword("OututStopClock", adjustedCropStopClockCount);
-  
+
       // Cleanup
       p.EndProcess();
-      
+
       delete g_in;
       g_in = NULL;
-       
+
       // Write the results to the log
       if(log) {
         log->addGroup(results);
       }
-      
+
       // Unfurnishes kernel files to prevent file table overflow
       NaifStatus::CheckErrors();
       unload_c(ckFileName.c_str());
@@ -375,7 +383,7 @@ namespace Isis {
       NaifStatus::CheckErrors();
     }
     catch (IException &e) {
-      IString msg = "Unable to crop the given cube [" + inputFileName 
+      IString msg = "Unable to crop the given cube [" + inputFileName
                     + "] using the hicrop program.";
       // clean up before throwing exception
       delete g_in;
@@ -383,8 +391,8 @@ namespace Isis {
       throw IException(e, IException::Unknown, msg, _FILEINFO_);
     }
   }
-  
-  /** 
+
+  /**
    *  Line processing routine.
    */
   void crop(Buffer &out) {
@@ -393,29 +401,29 @@ namespace Isis {
     int band = 1;
     g_in->SetLine(iline, 1);
     g_cube->read(*g_in);
-  
+
     // Loop and move appropriate samples
     for (int i = 0; i < out.size(); i++) {
       out[i] = (*g_in)[i];
     }
-  
+
     if (out.Line() == g_cropLineCount) band++;
   }
-  
-  /** 
-   * This method is used to determine the actual start or stop time for the input 
-   * image.  This is found by using the time corresponding to clock count 
-   * read from the label of the input cube. 
-   *  
-   * @param timeFromInputClockCount This value is passed in after converting the 
+
+  /**
+   * This method is used to determine the actual start or stop time for the input
+   * image.  This is found by using the time corresponding to clock count
+   * read from the label of the input cube.
+   *
+   * @param timeFromInputClockCount This value is passed in after converting the
    *                                clock count value from the labels to time
-   * @param tdiMode The Tdi keyword value from the labels of the input cube. 
+   * @param tdiMode The Tdi keyword value from the labels of the input cube.
    * @param unbinnedRate Calculated using values from the input label.
-   * @param binMode The Summing keyword value from the labels of the input cube. 
-   * 
+   * @param binMode The Summing keyword value from the labels of the input cube.
+   *
    * @see HiriseCamera::HiriseCamera(Pvl &lab)
    */
-  iTime actualTime(iTime timeFromInputClockCount, double tdiMode, 
+  iTime actualTime(iTime timeFromInputClockCount, double tdiMode,
                    double unbinnedRate, double binMode) {
     SpiceDouble adjustedTime = timeFromInputClockCount.Et();
     // Adjust the start time so that it is the effective time for
@@ -429,7 +437,7 @@ namespace Isis {
     adjustedTime += unbinnedRate * (((double) binMode / 2.0) - 0.5);
     // Effective observation time of the first line
     // in the image file, which is possibly binned
-  
+
     // Compute effective line number within the CCD (in pixels) for the
     // given TDI mode.
     //   This is the "centered" 0-based line number, where line 0 is the
@@ -439,35 +447,35 @@ namespace Isis {
     iTime actualStartTime = adjustedTime;
     return actualStartTime;
   }
-  
-  /** 
-   * This method is used to determine the time value that corresponds to the 
+
+  /**
+   * This method is used to determine the time value that corresponds to the
    * start or stop clock count that will be written to the output cube. This
-   * is found by using the actual start/stop time of the output cube. This 
-   * is done so that when a HiriseCamera object is created from this image, 
-   * the correct values will be calculated for the start time. 
-   *  
-   * @param actualCalculatedTime This value is the actual start/stop time of 
+   * is found by using the actual start/stop time of the output cube. This
+   * is done so that when a HiriseCamera object is created from this image,
+   * the correct values will be calculated for the start time.
+   *
+   * @param actualCalculatedTime This value is the actual start/stop time of
    *                             the output cube that will be adjusted for
    *                             the labels.
-   * @param tdiMode The Tdi keyword value from the labels of the input cube. 
+   * @param tdiMode The Tdi keyword value from the labels of the input cube.
    * @param unbinnedRate Calculated using values from the input label.
-   * @param binMode The Summing keyword value from the labels of the input cube. 
-   * 
+   * @param binMode The Summing keyword value from the labels of the input cube.
+   *
    * @see HiriseCamera::HiriseCamera(Pvl &lab)
    */
-  iTime labelClockCountTime(iTime actualCalculatedTime, double tdiMode, 
+  iTime labelClockCountTime(iTime actualCalculatedTime, double tdiMode,
                             double unbinnedRate, double binMode) {
-    iTime labelStartTime = actualCalculatedTime.Et() 
+    iTime labelStartTime = actualCalculatedTime.Et()
                            + unbinnedRate * ((tdiMode / 2.0) - 0.5)
                            - unbinnedRate * ((binMode / 2.0) - 0.5);
     return labelStartTime;
   }
-  
-  /** 
+
+  /**
    * Returns the first and last times that are covered by the given CK file. The
    * SCLK and LSK files must be furnished before this method is called.
-   * 
+   *
    * @param ckFileName String containing the name of the ck file provided by the
    *                   user.
    * @return A pair of doubles, the first is the earliest time covered by the CK
@@ -493,7 +501,7 @@ namespace Isis {
                     "single body CK files.";
       throw IException(IException::Unknown, msg, _FILEINFO_);
     }
-  
+
     //get the NAIF body code
     int body = SPICE_CELL_ELEM_I(&currCell, numberOfBodies-1);
     NaifStatus::CheckErrors();
@@ -525,63 +533,63 @@ namespace Isis {
     pair< double, double > coverage(startTime.toDouble(),  stopTime.toDouble());
     return coverage;
   }
-  
+
   /**
-   * Returns the corresponding time for the given line number. 
-   *  
-   * Notice that this method takes an exact double line value, not an int line 
-   * value. For example, if the ET at the beginning of a starting line is 
-   * desired, the value passed in should be the integer line number minus 0.5 and 
+   * Returns the corresponding time for the given line number.
+   *
+   * Notice that this method takes an exact double line value, not an int line
+   * value. For example, if the ET at the beginning of a starting line is
+   * desired, the value passed in should be the integer line number minus 0.5 and
    * if the ET at the end of the last line is desired, the integer end line number
-   * plus 0.5 should be passed in. 
-   *  
-   * @param lineNumber The exact line number value for which the image time will 
+   * plus 0.5 should be passed in.
+   *
+   * @param lineNumber The exact line number value for which the image time will
    *                   be found
-   * @param lineRate The line rate for this image, calculated by using label 
+   * @param lineRate The line rate for this image, calculated by using label
    *                 values.
-   * @param originalStartEt The actual start time for the image, calculated by 
+   * @param originalStartEt The actual start time for the image, calculated by
    *                        using label values.
-   *  
+   *
    * @return The image time corresponding to the given exact line number value.
-   *  
-   * @see LineScanDetectorMap::SetParent() 
-   *  
+   *
+   * @see LineScanDetectorMap::SetParent()
+   *
    */
   iTime line2time(double lineNumber, double lineRate, double originalStartEt) {
     iTime et = (double) (originalStartEt + lineRate * (lineNumber - 0.5));
     return et;
   }
-  
+
   /**
-   * Returns the corresponding line number for the given ephemeris time.  Note 
+   * Returns the corresponding line number for the given ephemeris time.  Note
    * that this return value is not an integer line, number, it is the exact double
    * line value associated with this time.
-   *  
-   * @param et The ephemeris time of the image whose exact line value will be 
+   *
+   * @param et The ephemeris time of the image whose exact line value will be
    *           found.
-   * @param lineRate The line rate for this image, calculated by using label 
+   * @param lineRate The line rate for this image, calculated by using label
    *                 values.
-   * @param originalStartEt The actual start time for the image, calculated by 
+   * @param originalStartEt The actual start time for the image, calculated by
    *                        using label values.
-   *  
+   *
    * @return The exact line number value corresponding to the given image time.
-   *  
-   * @see LineScanDetectorMap::SetDetector() 
+   *
+   * @see LineScanDetectorMap::SetDetector()
    */
   double et2line(double et, double lineRate, double originalStartEt) {
     return (et - originalStartEt) / lineRate + 0.5;
   }
-  
-  /** 
-   * Returns the corresponding clock count, in string format, for the given time. 
-   *  
-   * HiRise is high precision, so the spacecraft clock format is 
-   * P/SSSSSSSSSS:FFFFF and the clock id = -74999. (See any mro sclk file 
+
+  /**
+   * Returns the corresponding clock count, in string format, for the given time.
+   *
+   * HiRise is high precision, so the spacecraft clock format is
+   * P/SSSSSSSSSS:FFFFF and the clock id = -74999. (See any mro sclk file
    * for documentation on these values.)
-   *  
+   *
    * @param time The time of the image to be converted.
-   *  
-   * @return A string containing the spacecraft clock count corresponding 
+   *
+   * @return A string containing the spacecraft clock count corresponding
    *         to the given time.
    */
   QString time2clock(iTime time) {
@@ -593,14 +601,14 @@ namespace Isis {
     NaifStatus::CheckErrors();
     return stringOutput;
   }
-  
-  /** 
-   * Returns the corresponding time for the given spacecraft clock count. 
-   *  
+
+  /**
+   * Returns the corresponding time for the given spacecraft clock count.
+   *
    * @param spacecraftClockCount The clock count of the image to be converted.
-   *  
+   *
    * @return The image time corresponding to the given spacecraft clock count.
-   *  
+   *
    * @see Spice::getClockTime(clockCountString, sclkCode)
    */
   iTime clock2time(QString spacecraftClockCount) {
@@ -615,8 +623,8 @@ namespace Isis {
     iTime time = clockTime.toDouble();
     return time;
   }
-  
-  
+
+
   /**
    * This method is used to verify that the values found for the start and end
    * lines is valid.
@@ -629,7 +637,7 @@ namespace Isis {
       throw IException(IException::Unknown, msg, _FILEINFO_);
     }
   }
-  
+
   /**
    * This method is used to verify that the values found for the start and end
    * lines is valid.
@@ -637,22 +645,22 @@ namespace Isis {
   void validateCropTimes(double cropStart, double  cropStop, double ckFirstTime, double ckLastTime) {
     if (cropStart < ckFirstTime ||
         cropStop > ckLastTime) {
-      IString msg = "Invalid start/stop times [" + IString(cropStart) + ", " 
+      IString msg = "Invalid start/stop times [" + IString(cropStart) + ", "
                     + IString(cropStop) + "]. These times fall outside of the "
                     "given CK file's time coverage [" + IString(ckFirstTime)
                     + ", " + IString(ckLastTime) + "].";
       throw IException(IException::Unknown, msg, _FILEINFO_);
     }
-  
-    // Now, for user inputs other than line/nlines, use the start and end 
+
+    // Now, for user inputs other than line/nlines, use the start and end
     // times we found to calculate the cropped start/end line numbers
     if (cropStart >= cropStop) {
       IString msg = "Invalid start/stop times. The start ET "
                     "value [" + IString(cropStart) + "] is greater "
-                    "than or equal to the stop ET value [" 
+                    "than or equal to the stop ET value ["
                     + IString(cropStop) + "].";
       throw IException(IException::Io, msg, _FILEINFO_);
     }
-  
+
   }
 }
diff --git a/isis/src/mro/apps/hicrop/hicrop.h b/isis/src/mro/apps/hicrop/hicrop.h
index 58e93d38e8b993f76fb394ccc5fa7955fa921c5e..c241d24cb7ae4766309615dd9f08e91d188d3048 100644
--- a/isis/src/mro/apps/hicrop/hicrop.h
+++ b/isis/src/mro/apps/hicrop/hicrop.h
@@ -1,6 +1,14 @@
-#ifndef hicrop_h 
+#ifndef hicrop_h
 #define hicrop_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "UserInterface.h"
 
@@ -9,4 +17,4 @@ namespace Isis{
   extern void hicrop(Cube *cube, UserInterface &ui, Pvl *log=nullptr);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/isis/src/mro/apps/hicrop/main.cpp b/isis/src/mro/apps/hicrop/main.cpp
index 73fcdf00463c6e309b0e2f53aabdef6d8e5716b3..f1ab8780b8a11b644a899a39127472969d3e33b2 100644
--- a/isis/src/mro/apps/hicrop/main.cpp
+++ b/isis/src/mro/apps/hicrop/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
@@ -19,8 +27,8 @@ void IsisMain() {
     }
     throw;
   }
- 
+
   for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {
     Application::Log(*grpIt);
   }
-}
\ No newline at end of file
+}
diff --git a/isis/src/mro/apps/hicubeit/hicubeit.cpp b/isis/src/mro/apps/hicubeit/hicubeit.cpp
index d4d0ef0691f9a7e636937e466d509b40a238332a..b5b532e4621248202228914cd09c56412bb3f99a 100644
--- a/isis/src/mro/apps/hicubeit/hicubeit.cpp
+++ b/isis/src/mro/apps/hicubeit/hicubeit.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "hicubeit.h"
 
 #include "TextFile.h"
diff --git a/isis/src/mro/apps/hicubeit/hicubeit.h b/isis/src/mro/apps/hicubeit/hicubeit.h
index 37eac29bd6422faa444d13d51804471c3c3754b0..9aa68df2da41d75aba2da7d9cbf9d1e5504de3a5 100644
--- a/isis/src/mro/apps/hicubeit/hicubeit.h
+++ b/isis/src/mro/apps/hicubeit/hicubeit.h
@@ -1,6 +1,14 @@
 #ifndef hicubeit_h
 #define hicubeit_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 
 namespace Isis{
diff --git a/isis/src/mro/apps/hicubeit/main.cpp b/isis/src/mro/apps/hicubeit/main.cpp
index ad28f8642862aa09aba16d0c0393f31c224cce95..065f4d8f9adc4e9d5972841e6f0b4162e200026e 100644
--- a/isis/src/mro/apps/hicubeit/main.cpp
+++ b/isis/src/mro/apps/hicubeit/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "hicubeit.h"
diff --git a/isis/src/mro/apps/hicubenorm/hicubenorm.cpp b/isis/src/mro/apps/hicubenorm/hicubenorm.cpp
index 9410b43a820459d0e0283e9edc410b77156347fc..9b1388546150b69acf2b00164e24efccd00deef7 100644
--- a/isis/src/mro/apps/hicubenorm/hicubenorm.cpp
+++ b/isis/src/mro/apps/hicubenorm/hicubenorm.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // system include files go first
 #include <QString>
 #include <iostream>
@@ -74,9 +82,9 @@ namespace Isis {
 
         // We will be processing by tile.
         ProcessByTile p;
-        
+
         p.SetInputCube(icube);
-        
+
         // Setup the input cube;
         // Obtain information from the input file
         totalSamples = icube->sampleCount();
@@ -84,7 +92,7 @@ namespace Isis {
         totalBands   = icube->bandCount();
 
         channel = icube->group("Instrument")["ChannelNumber"];
-        
+
         // Cubenorm New Version Flag
         bool bNewVersion = ui.GetBoolean("NEW_VERSION");
 
@@ -160,10 +168,10 @@ namespace Isis {
                 }
             }
             }
-            
+
             Isis::CubeAttributeOutput atts = ui.GetOutputAttribute("TO");
             FileName outFileName = ui.GetFileName("TO");
-        
+
             // Setup the output file and apply the coefficients by either
             // subtracting or multipling them
             p.SetOutputCube(outFileName.expanded(), atts, totalSamples, totalLines, totalBands);
@@ -176,7 +184,7 @@ namespace Isis {
                 keepSame(totalBands, rowcol, DIVIDE);
             }
             }
-            
+
             // Process based on the mode
             if(ui.GetString("MODE") == "SUBTRACT") {
                 p.StartProcess(subtract);
diff --git a/isis/src/mro/apps/hicubenorm/hicubenorm.h b/isis/src/mro/apps/hicubenorm/hicubenorm.h
index 1f680b113834f92523c9f0be8d300895ec84cf8c..5df19942a326502e1bc44dc3962b7f0122b0b929 100644
--- a/isis/src/mro/apps/hicubenorm/hicubenorm.h
+++ b/isis/src/mro/apps/hicubenorm/hicubenorm.h
@@ -1,6 +1,14 @@
-#ifndef hicubenorm_h 
+#ifndef hicubenorm_h
 #define hicubenorm_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/mro/apps/hicubenorm/main.cpp b/isis/src/mro/apps/hicubenorm/main.cpp
index ae179d34783462f19a972981b7a4218aa3d9e137..44133901019e4b3784ec9d12a00ab83a78839981 100644
--- a/isis/src/mro/apps/hicubenorm/main.cpp
+++ b/isis/src/mro/apps/hicubenorm/main.cpp
@@ -1,7 +1,15 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
-#include "hicubenorm.h" 
+#include "hicubenorm.h"
 
 using namespace Isis;
 
diff --git a/isis/src/mro/apps/hideal2pds/main.cpp b/isis/src/mro/apps/hideal2pds/main.cpp
index 2f25e47a42db9f2d455f191cff92ff92d6b04358..4473cf4375bfa3c7c147f052ea314ba423223b8c 100644
--- a/isis/src/mro/apps/hideal2pds/main.cpp
+++ b/isis/src/mro/apps/hideal2pds/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <fstream>
diff --git a/isis/src/mro/apps/hidestripe/main.cpp b/isis/src/mro/apps/hidestripe/main.cpp
index 2357d357496deb4715f2abda63f7d51dcb96b7ce..64c7a42a2f4e962c2d9fb374c653596631427d52 100644
--- a/isis/src/mro/apps/hidestripe/main.cpp
+++ b/isis/src/mro/apps/hidestripe/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 // system include files go first
diff --git a/isis/src/mro/apps/hidtmgen/hidtmgen.cpp b/isis/src/mro/apps/hidtmgen/hidtmgen.cpp
index 5a8d145cb553c4322941c3d87b569b649d13abe9..f1df2310bf07e02e7d0c243e1ed43f7acb3e5e4c 100644
--- a/isis/src/mro/apps/hidtmgen/hidtmgen.cpp
+++ b/isis/src/mro/apps/hidtmgen/hidtmgen.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDir>
 #include <QString>
 #include <QStringList>
diff --git a/isis/src/mro/apps/hidtmgen/hidtmgen.h b/isis/src/mro/apps/hidtmgen/hidtmgen.h
index f3fde729d08c31b9ae50fae4ba87a1858f8e0aeb..0fe8a460bd3c254086fd5d1861dcee9960664d24 100644
--- a/isis/src/mro/apps/hidtmgen/hidtmgen.h
+++ b/isis/src/mro/apps/hidtmgen/hidtmgen.h
@@ -1,6 +1,14 @@
-#ifndef hidtmgen_h // Change this to your app name in all lower case suffixed with _h (e.g. campt_h, cam2map_h etc.)
+#ifndef hidtmgen_h
 #define hidtmgen_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Cube.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/mro/apps/hidtmgen/main.cpp b/isis/src/mro/apps/hidtmgen/main.cpp
index 5b370cfb2368c9acd72463982740ddb935d08ed0..1867111f9b7029eb6d7b143192835d53e1efc6c5 100644
--- a/isis/src/mro/apps/hidtmgen/main.cpp
+++ b/isis/src/mro/apps/hidtmgen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
diff --git a/isis/src/mro/apps/hiequal/main.cpp b/isis/src/mro/apps/hiequal/main.cpp
index 92cb946d32ced2eb5ffe4e574a8bbbfbb6db3a2c..139e03a616da4895b3c6f43276af9c6ce31a660e 100644
--- a/isis/src/mro/apps/hiequal/main.cpp
+++ b/isis/src/mro/apps/hiequal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "HiEqualization.h"
@@ -48,4 +56,3 @@ void IsisMain() {
         ui.GetFileName("TOLIST") : "");
   }
 }
-
diff --git a/isis/src/mro/apps/hifringe/main.cpp b/isis/src/mro/apps/hifringe/main.cpp
index 4ca8fc7e941ae5bdfb8b87c24a9fdc0bbaee3f36..11b7dc98ff61b75c63108fad1163147071db4357 100644
--- a/isis/src/mro/apps/hifringe/main.cpp
+++ b/isis/src/mro/apps/hifringe/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 /*
 $Id: hifringe.cpp,v 1.6 2008/05/14 21:07:24 slambright Exp $
 
diff --git a/isis/src/mro/apps/hifurrows/main.cpp b/isis/src/mro/apps/hifurrows/main.cpp
index d58744bbc43fd1bf12ad260874fb78fd8ec49a25..ebc9ee64e5ca85714de8a79ea493f68229a6b209 100644
--- a/isis/src/mro/apps/hifurrows/main.cpp
+++ b/isis/src/mro/apps/hifurrows/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "ProcessBySample.h"
@@ -459,4 +467,3 @@ void GetFurrowThresholdValues(int piCcdId, int piBin)
 #endif
 
 }
-
diff --git a/isis/src/mro/apps/higlob/main.cpp b/isis/src/mro/apps/higlob/main.cpp
index 48cfab8d7ede962327a8f9855e64a89052a0d166..93d45b12f08cb1086708b78ba75c574d0b9b5653 100644
--- a/isis/src/mro/apps/higlob/main.cpp
+++ b/isis/src/mro/apps/higlob/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "FileName.h"
@@ -162,4 +170,3 @@ double int2ToDouble(int value) {
   else return value;
 
 }
-
diff --git a/isis/src/mro/apps/hijitreg/HiJitCube.cpp b/isis/src/mro/apps/hijitreg/HiJitCube.cpp
index 9f431cc2e8fcd5d5542548f8c9205fd17340f947..fbccb93949685989a999809791fd2f016c866af9 100644
--- a/isis/src/mro/apps/hijitreg/HiJitCube.cpp
+++ b/isis/src/mro/apps/hijitreg/HiJitCube.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2009/12/29 23:03:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iostream>
 #include <sstream>
diff --git a/isis/src/mro/apps/hijitreg/HiJitCube.h b/isis/src/mro/apps/hijitreg/HiJitCube.h
index 034eb5348dee6c247a7c157b8fdb8e21e3859a38..3be9ab1eb51a0f43ea5e09514b763095a9f0d6fe 100644
--- a/isis/src/mro/apps/hijitreg/HiJitCube.h
+++ b/isis/src/mro/apps/hijitreg/HiJitCube.h
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/08/19 22:37:41 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #ifndef HiJitCube_h
 #define HiJitCube_h
 
diff --git a/isis/src/mro/apps/hijitreg/main.cpp b/isis/src/mro/apps/hijitreg/main.cpp
index 0ebff5a2af61a28ebea7371b9c3a5ed55169c8b7..6758741748a4911ae58274c178171c0b6e05c4f3 100644
--- a/isis/src/mro/apps/hijitreg/main.cpp
+++ b/isis/src/mro/apps/hijitreg/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cmath>
diff --git a/isis/src/mro/apps/hijitter/main.cpp b/isis/src/mro/apps/hijitter/main.cpp
index 3c67f8a22518d48c76b65aafa78e46f93e418383..8cb2efb38d562d16361cafa6e97607e4cc15a747 100644
--- a/isis/src/mro/apps/hijitter/main.cpp
+++ b/isis/src/mro/apps/hijitter/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Camera.h"
@@ -56,7 +64,7 @@ double g_avgOffsets[11][2];
     7 |   7-8   | -576
     8 |   8-9   |  607
     9 |  10-11  |  606
-   10 |  12-13  |  606      */ 
+   10 |  12-13  |  606      */
 
 const double g_lineOff[11] = {
    574,
@@ -73,7 +81,7 @@ const double g_lineOff[11] = {
 };
 
 void IsisMain() {
-  // clear global vectors and intitialize global ints 
+  // clear global vectors and intitialize global ints
   g_ccdFiles.clear();
   g_tempFiles.clear();
   g_ccdNumbers.clear();
@@ -92,7 +100,7 @@ void IsisMain() {
   init(inputList);
 
   // The first pipeline will create the match cube file
-  // 
+  //
   // cubeatt FROM="masterCcdFileName.cub" TO="./matchMaster.cub"
   // spiceinit FROM="./matchMaster.cub" ATTACH="NO"
   // spicefit FROM="./matchMaster.cub"
@@ -117,19 +125,19 @@ void IsisMain() {
 
   matchfilePipeline.Run();
 
-  // The main hijitter pipeline 
-  // 
+  // The main hijitter pipeline
+  //
   // FIRST PASS:
-  // 
+  //
   // for each file in file list
   // cubeatt FROM="originalFileName.cub" TO="./noproj.copy.FROM1.cub"
-  // 
+  //
   // for i = 1 to i = numFiles
   // spiceinit FROM="./noproj.copy.FROM1.cub" ATTACH="NO"
-  // 
+  //
   // echo  ./noproj.copy.FROM1.cub ./noproj.copy.FROM2.cub ... ./noproj.copy.FROM(numFiles).cub > ./appjit.lis
   // appjit FROMLIST="./appjit.lis" JITTER="jitterFileName.txt"
-  // 
+  //
   // for i = 1 to i = numFiles
   // noproj FROM="./noproj.copy.FROM1.cub" TO="./noproj.FROM1.cub" MATCH="./matchMaster.cub"
   Pipeline mainPipeline("Main hijitter Pipeline: cubeatt >> spiceinit >> appjit >> noproj");
@@ -148,8 +156,8 @@ void IsisMain() {
   mainPipeline.Application("spiceinit").AddConstParameter("ATTACH", "NO");
 
   mainPipeline.AddToPipeline("appjit");
-  mainPipeline.Application("appjit").SetInputParameter("FROMLIST", 
-                                            PipelineApplication::LastAppOutputListNoMerge, 
+  mainPipeline.Application("appjit").SetInputParameter("FROMLIST",
+                                            PipelineApplication::LastAppOutputListNoMerge,
                                             false);
   mainPipeline.Application("appjit").AddParameter("JITTER", "JITTER");
   mainPipeline.Application("appjit").AddParameter("DEGREE", "DEGREE");
@@ -158,7 +166,7 @@ void IsisMain() {
 
   mainPipeline.AddToPipeline("noproj");
   mainPipeline.Application("noproj").SetInputParameter("FROM", true);
-  mainPipeline.Application("noproj").AddConstParameter("MATCH", 
+  mainPipeline.Application("noproj").AddConstParameter("MATCH",
                                             FileName("$TEMPORARY/matchMaster.cub").expanded());
   mainPipeline.Application("noproj").SetOutputParameter("TO", FileName("$TEMPORARY/noproj").expanded());
 
@@ -172,16 +180,16 @@ void IsisMain() {
 
   if (ui.WasEntered("JITTERCK"))  {
     // run main hijitter pipeline again with the same parameters
-    // 
+    //
     // for each file in file list
     // cubeatt FROM="originalFileName.cub" TO="./noproj.copy.FROM1.cub"
-    // 
+    //
     // for i = 1 to i = numFiles
     // spiceinit FROM="./noproj.copy.FROM1.cub" ATTACH="NO"
-    // 
+    //
     // echo  ./noproj.copy.FROM1.cub ./noproj.copy.FROM2.cub ... ./noproj.copy.FROM(numFiles).cub > ./appjit.lis
     // appjit FROMLIST="./appjit.lis" JITTER="jitterFileName.txt"
-    // 
+    //
     // for i = 1 to i = numFiles
     // noproj FROM="./noproj.copy.FROM1.cub" TO="./noproj.FROM1.cub" MATCH="./matchMaster.cub"
     mainPipeline.Run();
@@ -189,7 +197,7 @@ void IsisMain() {
 
   // the outputs from this pipeline are temporary files created by cubeatt
   for (int i = 0; i < g_numFiles; i++) {
-    g_tempFiles.push_back(FileName("$TEMPORARY/noproj.FROM" 
+    g_tempFiles.push_back(FileName("$TEMPORARY/noproj.FROM"
                                    + toString(i + 1) + ".cub").expanded());
   }
 
@@ -197,15 +205,15 @@ void IsisMain() {
   processNoprojFiles(mainPipeline);
 
   // run main hijitter pipeline with new parameters:
-  // 
+  //
   // for each file in file list
   // cubeatt FROM="originalFileName.cub" TO="originalFileName.jitter.copy.FROM1.cub"
   // spiceinit FROM="originalFileName.jitter.copy.FROM1.cub" ATTACH="NO"
-  // 
+  //
   // echo  originalFileName.jitter.copy.FROM1.cub originalFileName.jitter.copy.FROM2.cub   ...  > ./appjit.lis
   // appjit FROMLIST="./appjit.lis" JITTER="jitterFileName.txt" MASTER="masterCcdFileName.jitter.copy.FROM1.cub" PITCHRATE="2.95810564663024e-05"
   // YAW="-9.06833084756325e-04"
-  // 
+  //
   // for each file in file list
   // noproj FROM="originalFileName.jitter.copy.FROM1.cub" TO="originalFileName.jitter.cub" MATCH="./matchMaster.cub"
   // editlab FROM="originalFileName.jitter.cub" OPTIONS="SETKEY" GRPNAME="Instrument" KEYWORD="ImageJitterCorrected" VALUE="1"
@@ -243,14 +251,14 @@ void IsisMain() {
       throw IException(IException::Programmer, msg, _FILEINFO_);
     }
     // run main hijitter pipeline with same parameters as last run:
-    // 
+    //
     // for each file in file list
     // cubeatt FROM="originalFileName.cub" TO="originalFileName.jitter.copy.FROM1.cub"
     // spiceinit FROM="originalFileName.jitter.copy.FROM1.cub" ATTACH="NO"
-    // 
+    //
     // echo  originalFileName.jitter.copy.FROM1.cub originalFileName.jitter.copy.FROM2.cub   ...  > ./appjit.lis
     // appjit FROMLIST="./appjit.lis" JITTER="jitterFileName.txt" MASTER="masterFile.jitter.copy.FROM1.cub" PITCHRATE="2.95810564663024e-05" YAW="-9.06833084756325e-04"
-    // 
+    //
     // for each file in file list
     // noproj FROM="originalFileName.jitter.copy.FROM1.cub" TO="originalFileName.jitter.cub" MATCH="./matchMaster.cub"
     // editlab FROM="originalFileName.jitter.cub" OPTIONS="SETKEY" GRPNAME="Instrument" KEYWORD="ImageJitterCorrected" VALUE="1"
@@ -309,8 +317,8 @@ void IsisMain() {
 }
 
 /**
- * This method will validate and return the file name corresponding to 
- * the given master ccd number. 
+ * This method will validate and return the file name corresponding to
+ * the given master ccd number.
  *
  * @param inList Input file list
  * @param masterCcdNumber Number of the master CCD
@@ -330,10 +338,10 @@ FileName masterCcdFileName(FileList &inList, int masterCcdNumber) {
 }
 
 /**
- * This method will validate the input file list and set global 
- * variables: g_ccdFiles, g_ccdNumbers, g_numFiles, 
- * g_firstFilter 
- *  
+ * This method will validate the input file list and set global
+ * variables: g_ccdFiles, g_ccdNumbers, g_numFiles,
+ * g_firstFilter
+ *
  * @param inList Input file list entered by the user
  */
 void init(FileList &inList) {
@@ -365,14 +373,14 @@ void init(FileList &inList) {
         ccdNumber = (int) toInt((QString)ccdKeywordValue.mid(2));
       }
       else {
-        QString msg = "CcdId value of [" + ccdKeywordValue + "] found in [" 
+        QString msg = "CcdId value of [" + ccdKeywordValue + "] found in ["
                       + inList[i].toString() + "] not supported. Valid values "
                       "include RED0-RED9, IR10-IR11, BG12-BG13";
         throw IException(IException::Programmer, msg, _FILEINFO_);
       }
 
       if (ccdNumber < 0 || ccdNumber > 13) {
-        QString msg = "CcdId value of [" + ccdKeywordValue + "] found in [" 
+        QString msg = "CcdId value of [" + ccdKeywordValue + "] found in ["
                       + inList[i].toString() + "] not supported. Valid values "
                       "include RED0-RED9, IR10-IR11, BG12-BG13";
         throw IException(IException::Programmer, msg, _FILEINFO_);
@@ -418,7 +426,7 @@ void init(FileList &inList) {
 //    }
 //    else if (foundFirstRedCcd && foundLastRedCcd && !g_ccdFiles[i].empty()) {
 //      QString msg = "Invalid file list. All red CCDs listed must be consecutive. "
-//                    "Input list has files containing [RED" + lastRedCcdFound 
+//                    "Input list has files containing [RED" + lastRedCcdFound
 //                    + "] and [RED" + toString((int)i) + "], but the CCDs between "
 //                    "are not represented in the given file list.";
 //      throw IException(IException::User, msg, _FILEINFO_);
@@ -463,7 +471,7 @@ void init(FileList &inList) {
           overlappingCcds = "CCD [" + color + toString((int) (i-1)) + "] is";
         }
         else {
-          overlappingCcds = "CCDs [RED" + toString((int) (i-1)) 
+          overlappingCcds = "CCDs [RED" + toString((int) (i-1))
                          + "] and [RED" + toString((int) (i+1)) + "] are";
         }
         QString msg = "Invalid file list. A file containing the CCD [" + color
@@ -481,12 +489,12 @@ void init(FileList &inList) {
 
 
 
-/** 
- * 
+/**
+ *
  *  @param p
- * 
- */ 
-void processNoprojFiles(Pipeline &p) {                                          
+ *
+ */
+void processNoprojFiles(Pipeline &p) {
   UserInterface &ui = Application::GetUserInterface();
 
   // This will be decremented on error, it's easier this way
@@ -494,7 +502,7 @@ void processNoprojFiles(Pipeline &p) {
   // numOffsets is an unnecesary variable. It should equal offsetIndeces.size()
   // int numOffsets = g_numFiles - 1;
   vector<int> offsetIndices;
- 
+
   Progress hijitregProg;
   hijitregProg.SetText("Running hijitreg");
   hijitregProg.SetMaximumSteps(1);
@@ -505,23 +513,23 @@ void processNoprojFiles(Pipeline &p) {
     // use the current cubes in the pipeline to create an output flat
     // file for this overlap from the hijireg program. This will
     // calculate avg offsets for the overlaps.
-    // 
+    //
     // Note that the consecutive CCD pairs (9,10) and (11,12) do not
     // overlap since 0-9 are red, 10-11 are near-infrared, and 12-13
     // are blue-green. For this reason, we don't run hijitreg for the
     // CCDs 9, 11, and 13.
-    if (g_ccdNumbers[i] != 9 && g_ccdNumbers[i] != 11 && g_ccdNumbers[i] != 13 
+    if (g_ccdNumbers[i] != 9 && g_ccdNumbers[i] != 11 && g_ccdNumbers[i] != 13
         && g_ccdNumbers[i+1] == g_ccdNumbers[i] + 1) {
 
       QString tempDir = FileName("$TEMPORARY").expanded();
-      QString flatFileName = tempDir + "/first" + toString(g_ccdNumbers[i]) 
+      QString flatFileName = tempDir + "/first" + toString(g_ccdNumbers[i])
                             + "-" + toString(g_ccdNumbers[i+1]) + ".flat";
       QString params = "";
       params += "FROM=" + tempDir + "/noproj.FROM" + toString(i + 1) + ".cub";
       params += " MATCH=" + tempDir + "/noproj.FROM" + toString(i + 2) + ".cub";
       params += " REGDEF=" + ui.GetFileName("REGDEF");
       params += " FLAT=" + flatFileName;
-      
+
       try {
         // hijitreg FROM=$TEMPORARY/noproj.FROM1.cub MATCH=
         ProgramLauncher::RunIsisProgram("hijitreg", params);
@@ -532,11 +540,11 @@ void processNoprojFiles(Pipeline &p) {
       }
 
       // Read offsets
-      
+
       TextFile flatFile(flatFileName);
       g_tempFiles.push_back(flatFileName);
-      
-      // set the offset index value (0-10) 
+
+      // set the offset index value (0-10)
       // Note: we know that g_ccdNumbers is not 9, 11, 13 since these cases are
       // already excluded above
       int offsetIndex = 0;
@@ -552,35 +560,35 @@ void processNoprojFiles(Pipeline &p) {
 
       g_avgOffsets[offsetIndex][0] = Isis::Null;
       g_avgOffsets[offsetIndex][1] = Isis::Null;
-      
+
       QString line;
       try {
         while( flatFile.GetLine(line, false) &&
-               (g_avgOffsets[offsetIndex][0] == Isis::Null 
+               (g_avgOffsets[offsetIndex][0] == Isis::Null
                 || g_avgOffsets[offsetIndex][1] == Isis::Null) ) {
           line = QString(line).simplified();
           int pos = line.indexOf("Average Sample Offset: ");
-      
+
           if (pos != -1) {
             // cut off text before our number (start pos + strlen + 1)
             line = line.mid(pos + strlen("Average Sample Offset: "));
-      
+
             // cut off text after our number
             line = line.mid(0, line.indexOf(" "));
-      
+
             g_avgOffsets[offsetIndex][0] = (double)toDouble((QString)line);
             pos = -1;
           }
-      
+
           pos = line.indexOf("Average Line Offset: ");
-      
+
           if (pos != -1) {
             // cut off text before our number (start pos + strlen + 1)
             line = line.mid(pos + strlen("Average Line Offset: "));
-      
+
             // cut off text after our number
             line = line.mid(0, line.indexOf(" "));
-      
+
             g_avgOffsets[offsetIndex][1] = (double)toDouble((QString)line);
             pos = -1;
           }
@@ -709,4 +717,3 @@ void cropLines(QString inFile, double eTime1, double eTime2, int & line1, int &
   inCube->close();
   delete(inCube);
 }
-
diff --git a/isis/src/mro/apps/himos/himos.cpp b/isis/src/mro/apps/himos/himos.cpp
index d327c457bed2a95021943d71f1f046744f4f2aa0..aae9f68c4c5463cd79b8531589694baaadcd7b20 100644
--- a/isis/src/mro/apps/himos/himos.cpp
+++ b/isis/src/mro/apps/himos/himos.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "himos.h"
 
 #include "Camera.h"
diff --git a/isis/src/mro/apps/himos/himos.h b/isis/src/mro/apps/himos/himos.h
index 349171e6bb0e5bfb084f2d49e4d79d6b3e7e078e..14d1682ead15aaead24cb077ea33f4bfb1f13eda 100644
--- a/isis/src/mro/apps/himos/himos.h
+++ b/isis/src/mro/apps/himos/himos.h
@@ -1,6 +1,14 @@
 #ifndef himos_h
 #define himos_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "UserInterface.h"
 
 namespace Isis{
diff --git a/isis/src/mro/apps/himos/main.cpp b/isis/src/mro/apps/himos/main.cpp
index 2f9b18f41a804a126bda0d4d3e2fcbe53ffb1026..7f6e6d579596ae6eed19c26fdeed66850c5e5dfe 100644
--- a/isis/src/mro/apps/himos/main.cpp
+++ b/isis/src/mro/apps/himos/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "himos.h"
diff --git a/isis/src/mro/apps/hinoise/main.cpp b/isis/src/mro/apps/hinoise/main.cpp
index 4d84fff98ca246b9ad4b4273479f8988cedf7c18..97f7ac8078997f5fdbb381ac9d8aa6ccd1cfcb04 100644
--- a/isis/src/mro/apps/hinoise/main.cpp
+++ b/isis/src/mro/apps/hinoise/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include <iostream>
 #include <QString>
diff --git a/isis/src/mro/apps/hirdr2isis/main.cpp b/isis/src/mro/apps/hirdr2isis/main.cpp
index a4d535fbf4e3433d34edfd940791abf7ad207b7a..5165790e05a5f10e8c89e133f76af5b6872f5df0 100644
--- a/isis/src/mro/apps/hirdr2isis/main.cpp
+++ b/isis/src/mro/apps/hirdr2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
diff --git a/isis/src/mro/apps/hirdrgen/main.cpp b/isis/src/mro/apps/hirdrgen/main.cpp
index 655d1b28029030c9e92d31372e00f74cc8a97d43..70e9c402de625c767f16210f663eb370697436bb 100644
--- a/isis/src/mro/apps/hirdrgen/main.cpp
+++ b/isis/src/mro/apps/hirdrgen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <fstream>
@@ -393,7 +401,7 @@ void IsisMain() {
      *  the input(x axis) values are the unsigned Xbit values from the PDS file
      */
     // ??? unneccessary calculation - this is done by ProcessExportPds class.
-    double slope = (maxmax - minmin) / (p.GetOutputMaximum() - p.GetOutputMinimum()); 
+    double slope = (maxmax - minmin) / (p.GetOutputMaximum() - p.GetOutputMinimum());
     double intercept = maxmax - slope * p.GetOutputMaximum();
     image.addKeyword(PvlKeyword("SCALING_FACTOR", toString(slope)), Pvl::Replace);
     image.addKeyword(PvlKeyword("OFFSET", toString(intercept)), Pvl::Replace);
diff --git a/isis/src/mro/apps/hisharpen/main.cpp b/isis/src/mro/apps/hisharpen/main.cpp
index 40a7bdb00f874a586f1b48232fffc9b3be2e5081..3ea4b3ba65117347059313720a830cdd8a5527d2 100644
--- a/isis/src/mro/apps/hisharpen/main.cpp
+++ b/isis/src/mro/apps/hisharpen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "Pipeline.h"
 #include "Cube.h"
diff --git a/isis/src/mro/apps/histat/main.cpp b/isis/src/mro/apps/histat/main.cpp
index 779acaa7aa3058010a449096040411ebde35fa81..8592611d8bbf05357ae396a694d1f2af11c7879d 100644
--- a/isis/src/mro/apps/histat/main.cpp
+++ b/isis/src/mro/apps/histat/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <vector>
diff --git a/isis/src/mro/apps/histitch/main.cpp b/isis/src/mro/apps/histitch/main.cpp
index 264faca7e814dfb5ae6cf0fb082c18b2189eda0e..22922664623ff97eac5eebcd890c128beaebc96d 100644
--- a/isis/src/mro/apps/histitch/main.cpp
+++ b/isis/src/mro/apps/histitch/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include "Isis.h"
 #include "QuickFilter.h"
diff --git a/isis/src/mro/apps/marci2isis/main.cpp b/isis/src/mro/apps/marci2isis/main.cpp
index 7ec0c8d2d190dd1ef341573a25de3d6d9b957f7f..5f966176eed18f5113e77e77d9e40bce600c3b24 100644
--- a/isis/src/mro/apps/marci2isis/main.cpp
+++ b/isis/src/mro/apps/marci2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "marci2isis.h"
@@ -20,7 +28,7 @@ void IsisMain() {
     }
     throw;
   }
-  
+
   for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {
     Application::Log(*grpIt);
   }
diff --git a/isis/src/mro/apps/marci2isis/marci2isis.cpp b/isis/src/mro/apps/marci2isis/marci2isis.cpp
index 29848d520352992306805d48682a54e3080ab3e6..1b8406b2600256aca2999532d08a19bee2807ede 100644
--- a/isis/src/mro/apps/marci2isis/marci2isis.cpp
+++ b/isis/src/mro/apps/marci2isis/marci2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "marci2isis.h"
 
 #include "ProcessImportPds.h"
@@ -158,7 +166,7 @@ namespace Isis{
       outputCubes[i]->write(origLabel);
     }
 
-    QString prodId = outputCubes[0]->label()->findGroup("Archive", Pvl::Traverse)["ProductId"][0]; 
+    QString prodId = outputCubes[0]->label()->findGroup("Archive", Pvl::Traverse)["ProductId"][0];
     prodId = prodId.toUpper();
     vector<int> frameseq;
     vector<double> exptime;
@@ -168,15 +176,15 @@ namespace Isis{
     double exposure = instInitial["ExposureDuration"][0].toDouble() * 1000.0;
 
     frameseq.push_back(0);
-    exptime.push_back(exposure); 
+    exptime.push_back(exposure);
 
     QString varExpFile = "$mro/calibration/marci/varexp.tab";
-    
+
     // Load the MARCI exposure duration calibration tables.
     bool header=false;
     int skip=0;
     FileName csvfile(varExpFile);
-      
+
     CSVReader csv(csvfile.expanded(), header, skip);
       // There may be multiple entries in the file for this productID,
       // so we *must* loop through the entire file.
@@ -191,7 +199,7 @@ namespace Isis{
         // Now, compare product ids from the input image and from the calibration table.
         if(fileProdId == prodId ) {
           if((row.dim1() - 1) != 2) {
-            QString msg = "This appears to be a malformed calibration file."; 
+            QString msg = "This appears to be a malformed calibration file.";
                     msg += " There are not enough columns in the CSV";
                     msg += " file to perform the exposure time correction.";
             throw IException(IException::User, msg, _FILEINFO_);
@@ -209,18 +217,18 @@ namespace Isis{
     }
 
     // If exptime < 2, no additional exposure durations were found in the varexp file, so
-    // assume a single exposure duration and warn the user. 
-    // Using single exposure duration is correct in many cases, but there is no way to check 
-    // using only the information in the label. 
+    // assume a single exposure duration and warn the user.
+    // Using single exposure duration is correct in many cases, but there is no way to check
+    // using only the information in the label.
     if (exptime.size() < 2) {
       PvlGroup missing("NoExposureTimeDataFound");
       PvlKeyword message("Message", "No variable exposure information found in the varexp file."
                                     " Assuming exposure time is fixed for [" + inFile.toString() +  "]" );
-      missing.addKeyword(message); 
+      missing.addKeyword(message);
       missing.addKeyword(PvlKeyword("FileNotFoundInVarexpFile", prodId), Pvl::Replace);
       log->addGroup(missing);
     }
-          
+
     // Translate labels to every image and close output cubes before calling EndProcess
 
       // Add these values to the label
diff --git a/isis/src/mro/apps/marci2isis/marci2isis.h b/isis/src/mro/apps/marci2isis/marci2isis.h
index f0a8edcda22052ca3d313f8d23ecec842176b645..486b0dd3af4777eca9ea58454bd4aa407a414eb8 100644
--- a/isis/src/mro/apps/marci2isis/marci2isis.h
+++ b/isis/src/mro/apps/marci2isis/marci2isis.h
@@ -1,6 +1,14 @@
 #ifndef marci2isis_h
 #define marci2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Pvl.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/mro/apps/marcical/main.cpp b/isis/src/mro/apps/marcical/main.cpp
index ea5c939f7ac20c1ef714380777bb898efdbb48c8..fdb99c2583f9e276933ef338337d598576acdbc1 100644
--- a/isis/src/mro/apps/marcical/main.cpp
+++ b/isis/src/mro/apps/marcical/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "SpecialPixel.h"
 #include "CubeAttribute.h"
@@ -344,12 +352,12 @@ void IsisMain() {
       // find the filter num
       int filtNum = 0;
       int numKnownFilters = sizeof(knownFilters) / sizeof(QString);
-      
+
       while (filtNum < numKnownFilters &&
             (QString)icube.label()->findGroup("BandBin", Pvl::Traverse)["FilterName"][filter] != knownFilters[filtNum]) {
         filtNum ++;
       }
-      
+
       padding[filter] = (colorOffset * filterHeight) * filtNum;
     }
     else {
@@ -370,7 +378,7 @@ void IsisMain() {
 
   if (!inst.hasKeyword("VariableExposureDuration") || !inst.hasKeyword("FrameNumber")) {
     QString msg = "The instrument keywords VariableExposureDuration and FrameNumber"
-                  "must exist to calibrate this MARCI file. Prior to isis3.10.0 these" 
+                  "must exist to calibrate this MARCI file. Prior to isis3.10.0 these"
                   "keywords were not added by marci2isis; you may need to rerun isis3.10+"
                   "marci2isis on your images.";
     throw IException(IException::User, msg, _FILEINFO_);
@@ -379,8 +387,8 @@ void IsisMain() {
   // The previous version of marcical read the first exposure duration and frame number from
   // the label and the other durations/frames (if any) from the mission's varexp.tab file.
   // In order to minimize the changes to this code while modifying it to use the keywords instead of
-  // reading the varexp.tab file directly, the duration/frame where the frame is zero are dropped from 
-  // the array when converting them from the keywords. This calibration code should be 
+  // reading the varexp.tab file directly, the duration/frame where the frame is zero are dropped from
+  // the array when converting them from the keywords. This calibration code should be
   // able to be simplified significantly by not removing the frameNumber=0 exposure/frame and
   // removing the first frame ifs in the calibration code below.
   PvlKeyword expTimesKey = inst["VariableExposureDuration"];
@@ -433,7 +441,7 @@ void IsisMain() {
         // Seems like something might be wrong here.
         frame = 0;
         exposure = ((double)icube.label()->findGroup("Instrument", Pvl::Traverse)["ExposureDuration"]) * 1000.0;
-      } 
+      }
       else {
         maxOffset = padding[band-1];
         frame = (icube.lineCount() - maxOffset) / filterHeight - 1;
@@ -466,7 +474,7 @@ void IsisMain() {
             else {
               exposure = ((double)icube.label()->findGroup("Instrument", Pvl::Traverse)["ExposureDuration"]) * 1000.0;
             }
-            // Exposure duration for the UV filters are calculated from the non-UV exposure duration 
+            // Exposure duration for the UV filters are calculated from the non-UV exposure duration
             if ((QString)icube.label()->findGroup("BandBin", Pvl::Traverse)["FilterName"][band-1] == "LONG_UV" ||
                  (QString)icube.label()->findGroup("BandBin", Pvl::Traverse)["FilterName"][band-1] == "SHORT_UV") {
               exposure = ifdelay - 57.763 - exposure;
@@ -571,7 +579,7 @@ void IsisMain() {
 }
 
 /*
-   From the MARCI calibration report, Bell et al., 2009, 
+   From the MARCI calibration report, Bell et al., 2009,
    Mars Reconnaissance Orbiter Mars Color Imager (MARCI):
    Instrument description, calibration, and performance, JGR, 114 E08S92
    doi:10.1029/2008JE003315
@@ -663,6 +671,6 @@ END_OBJECT = COLUMN
 
 END_OBJECT                     = TABLE
 
-END 
- 
+END
+
   */
diff --git a/isis/src/mro/apps/marciflip/main.cpp b/isis/src/mro/apps/marciflip/main.cpp
index 394ccfed7482010ae2396fe1de377c921a444a16..85743c9cdb80dba707605e3452450833b50b13c3 100644
--- a/isis/src/mro/apps/marciflip/main.cpp
+++ b/isis/src/mro/apps/marciflip/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessImportPds.h"
 #include "FileName.h"
diff --git a/isis/src/mro/apps/mroctx2isis/main.cpp b/isis/src/mro/apps/mroctx2isis/main.cpp
index 1a0e7f38543e67c31024b20915d8fac16bd8cac7..959db4e735f09fab029027059e615585dd11393f 100644
--- a/isis/src/mro/apps/mroctx2isis/main.cpp
+++ b/isis/src/mro/apps/mroctx2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessImportPds.h"
 #include "ProcessByLine.h"
diff --git a/isis/src/mro/apps/pds2hideal/main.cpp b/isis/src/mro/apps/pds2hideal/main.cpp
index 1c6f5c8ee80106e3ef3f2ae381be49cf75ec0ad2..6d1ade2ee89f73c43d0eae20f226640f25905855 100644
--- a/isis/src/mro/apps/pds2hideal/main.cpp
+++ b/isis/src/mro/apps/pds2hideal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QString>
@@ -37,7 +45,7 @@ void IsisMain() {
 
   Cube *outputCube = p.SetOutputCube("TO");
   Pvl otherGroups;
-  // translate the band bin and archive groups to this pvl  
+  // translate the band bin and archive groups to this pvl
   p.TranslatePdsLabels(otherGroups);
 
   p.ImportTable("INSTRUMENT_POINTING_TABLE");
@@ -65,10 +73,10 @@ void IsisMain() {
 
 
   Pvl *isisLabel = outputCube->label();
-  PvlToPvlTranslationManager labelXlater(pdsLabelPvl, 
+  PvlToPvlTranslationManager labelXlater(pdsLabelPvl,
                                  "$ISISROOT/appdata/translations/MroHiriseIdealPdsImportLabel.trn");
   labelXlater.Auto(*isisLabel);
-  
+
   PvlObject &naifKeywords = isisLabel->findObject("NaifKeywords");
   PvlKeyword bodyRadii("BODY499_RADII");
   bodyRadii.addValue(QString(pdsLabelPvl["A_AXIS_RADIUS"]));
@@ -82,7 +90,7 @@ void IsisMain() {
             Application::GetUserInterface().ProgramName();
   PvlGroup &archiveGroup = isisCubeObject.findGroup("Archive");
   archiveGroup += PvlKeyword("SOFTWARE_NAME", sfname);
-  
+
   PvlObject &pdsImageObj = pdsLabelPvl.findObject("IMAGE");
   double samples = double(pdsImageObj["LINE_SAMPLES"]);
   double lines = double(pdsImageObj["LINES"]);
@@ -189,4 +197,3 @@ void addTableKeywords(Pvl *isisLabel, Pvl pdsLabelPvl) {
      }
    }
 }
-
diff --git a/isis/src/mro/objs/CTXCamera/CTXCamera.cpp b/isis/src/mro/objs/CTXCamera/CTXCamera.cpp
index a6a4388d9df86cf8f8cade5be9ad77247584f5fa..aac46aab673f1fd8acb8d9e98b0c0287026f9ea8 100644
--- a/isis/src/mro/objs/CTXCamera/CTXCamera.cpp
+++ b/isis/src/mro/objs/CTXCamera/CTXCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "CTXCamera.h"
 
@@ -47,7 +35,7 @@ namespace Isis {
     m_instrumentNameShort = "CTX";
     m_spacecraftNameLong = "Mars Reconnaissance Orbiter";
     m_spacecraftNameShort = "MRO";
-    
+
     NaifStatus::CheckErrors();
     // Set up the camera info from ik/iak kernels
     SetFocalLength();
@@ -105,7 +93,7 @@ namespace Isis {
  * @param lab Cube labels
  *
  * @return Isis::Camera* CTXCamera
- * @internal 
+ * @internal
  *   @history 2011-05-03 Jeannie Walldren - Added documentation.  Removed Mro
  *            namespace.
  */
diff --git a/isis/src/mro/objs/CTXCamera/CTXCamera.h b/isis/src/mro/objs/CTXCamera/CTXCamera.h
index 3b163602e02756ce30cb2e2240f53db749f23faa..8589eee007b6fe2582b92cf51e78d331ad02bcf1 100644
--- a/isis/src/mro/objs/CTXCamera/CTXCamera.h
+++ b/isis/src/mro/objs/CTXCamera/CTXCamera.h
@@ -1,25 +1,13 @@
 #ifndef CTXCamera_h
 #define CTXCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -28,7 +16,7 @@ namespace Isis {
    * @brief MRO CTX Camera Model
    *
    * This is the camera model for the Mars Reconnaissance Orbiter Context Camera
-   * (CTX). 
+   * (CTX).
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup MarsReconnaissanceOrbiter
@@ -55,19 +43,19 @@ namespace Isis {
    *                           methods. Updated documentation. Removed Mro namespace wrap
    *                           inside Isis namespace. Added Isis Disclaimer to files. Added
    *                           NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2012-12-27 Tracie Sucharski, Fixed bug for images with a SpatialSumming=2.
-   *                           The images were compressed in the y-direction.  There was a line of 
-   *                           code commented out, "lineRate *= csum;".  From the 
-   *                           MRO_ctx_pds_sis.pdf, "Note that CTX implements downtrack summing by 
-   *                           increasing the line time; for example, a 2X2 summed image has an 
-   *                           actual line time twice that given by this field.".  Uncommenting 
+   *                           The images were compressed in the y-direction.  There was a line of
+   *                           code commented out, "lineRate *= csum;".  From the
+   *                           MRO_ctx_pds_sis.pdf, "Note that CTX implements downtrack summing by
+   *                           increasing the line time; for example, a 2X2 summed image has an
+   *                           actual line time twice that given by this field.".  Uncommenting
    *                           the line fixed the y-direction scale problem.  Fixes #826.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -80,23 +68,23 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-74000); }
 
-      /** 
+      /**
        *  CK Reference ID - MRO_MME_OF_DATE
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (-74900); }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/mro/objs/CTXCamera/unitTest.cpp b/isis/src/mro/objs/CTXCamera/unitTest.cpp
index 4c577cd577b28f23d77967d21cf4641fb62b0781..70f0dd271544ea7a3f30c4bc683140ed266fd140 100644
--- a/isis/src/mro/objs/CTXCamera/unitTest.cpp
+++ b/isis/src/mro/objs/CTXCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 
 #include "Camera.h"
@@ -32,7 +21,7 @@ using namespace Isis;
 /**
  * @brief unitTest for MRO CTX Camera Model
  *
- * This is the unitTest for the Mars Reconnaissance Orbiter Context Camera (CTX) camera model. 
+ * This is the unitTest for the Mars Reconnaissance Orbiter Context Camera (CTX) camera model.
  *
  * @author ????-??-?? Unknown
  *
@@ -67,14 +56,14 @@ int main(int argc, char *argv[]) {
       cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
       cout.setf(std::ios::fixed);
       cout << setprecision(9);
-  
+
       // Test kernel IDs
       cout << "Kernel IDs: " << endl;
       cout << "CK Frame ID = " << cam->CkFrameId() << endl;
       cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
       cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
       cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-      
+
       // Test name methods
       cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
       cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
diff --git a/isis/src/mro/objs/CrismCamera/CrismCamera.cpp b/isis/src/mro/objs/CrismCamera/CrismCamera.cpp
index 671a546dc48b0e3330972ffc99b23b5e82983a7a..1b2c5d83fb91e34c3d4eecd2029f26a201648356 100644
--- a/isis/src/mro/objs/CrismCamera/CrismCamera.cpp
+++ b/isis/src/mro/objs/CrismCamera/CrismCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "CrismCamera.h"
 
diff --git a/isis/src/mro/objs/CrismCamera/CrismCamera.h b/isis/src/mro/objs/CrismCamera/CrismCamera.h
index fd67715f52d75a5622741d9e848ba53bb8ac5122..d69d805becbf0601a82a589f3552ff26d4e07fa4 100644
--- a/isis/src/mro/objs/CrismCamera/CrismCamera.h
+++ b/isis/src/mro/objs/CrismCamera/CrismCamera.h
@@ -1,25 +1,13 @@
 #ifndef CrismCamera_h
 #define CrismCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -52,7 +40,7 @@ namespace Isis {
    *                           since Camera now handles this. References #2335.
    *   @history 2016-09-14 Kelvin Rodriguez - Enforced the order in which BORESIGHT_LINE and
    *                           BORESIGHT_SAMPLE are added to the PVL. Part of porting to
-   *                           OSX 10.11 
+   *                           OSX 10.11
    */
   class CrismCamera : public LineScanCamera {
     public:
diff --git a/isis/src/mro/objs/CrismCamera/unitTest.cpp b/isis/src/mro/objs/CrismCamera/unitTest.cpp
index e5b29aafd9da7eae484e621c35df9bd1b86b48e4..b2eb884cffa3f2a2f3b44b9280b8b26c17aa717e 100644
--- a/isis/src/mro/objs/CrismCamera/unitTest.cpp
+++ b/isis/src/mro/objs/CrismCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -100,7 +89,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -137,4 +126,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/mro/objs/HiCal/GainChannelNormalize.h b/isis/src/mro/objs/HiCal/GainChannelNormalize.h
index 7289173af38bd535b58764eb717442b18de5fdcc..3d79e099edf9ea145d6c899aee9ef93aa87c10b9 100644
--- a/isis/src/mro/objs/HiCal/GainChannelNormalize.h
+++ b/isis/src/mro/objs/HiCal/GainChannelNormalize.h
@@ -1,28 +1,14 @@
 #ifndef GainChannelNormalize_h
 #define GainChannelNormalize_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/05/14 21:07:22 $
- * $Id: GainChannelNormalize.h,v 1.2 2008/05/14 21:07:22 slambright Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
diff --git a/isis/src/mro/objs/HiCal/GainFlatField.h b/isis/src/mro/objs/HiCal/GainFlatField.h
index 084af4dbc95b2120585852b5607fccc93089ee0e..ac53a0b6d5e45f767a9e6d80c56d7307eab39504 100644
--- a/isis/src/mro/objs/HiCal/GainFlatField.h
+++ b/isis/src/mro/objs/HiCal/GainFlatField.h
@@ -1,28 +1,14 @@
 #ifndef GainFlatField_h
 #define GainFlatField_h
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2009/09/15 21:56:44 $
- * $Id: GainFlatField.h,v 1.4 2009/09/15 21:56:44 kbecker Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
diff --git a/isis/src/mro/objs/HiCal/GainLineDrift.h b/isis/src/mro/objs/HiCal/GainLineDrift.h
index b0b3729d540e341146cb3f523d91370432a277cf..833d109836219e53e4d090d6b068b670c7047ca0 100644
--- a/isis/src/mro/objs/HiCal/GainLineDrift.h
+++ b/isis/src/mro/objs/HiCal/GainLineDrift.h
@@ -1,28 +1,14 @@
 #ifndef GainLineDrift_h
 #define GainLineDrift_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/05/14 21:07:22 $
- * $Id: GainLineDrift.h,v 1.2 2008/05/14 21:07:22 slambright Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
diff --git a/isis/src/mro/objs/HiCal/GainNonLinearity.h b/isis/src/mro/objs/HiCal/GainNonLinearity.h
index f3ee196b7438a45e09da6af362c9acb021967740..54a408e7d288e6ad713d5417a8642a6b8153326d 100644
--- a/isis/src/mro/objs/HiCal/GainNonLinearity.h
+++ b/isis/src/mro/objs/HiCal/GainNonLinearity.h
@@ -1,28 +1,14 @@
 #ifndef GainNonLinearity_h
 #define GainNonLinearity_h
-/**
- * @file
- * $Revision: 1.1 $
- * $Date: 2009/09/15 21:56:44 $
- * $Id: GainNonLinearity.h,v 1.1 2009/09/15 21:56:44 kbecker Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
diff --git a/isis/src/mro/objs/HiCal/GainTemperature.h b/isis/src/mro/objs/HiCal/GainTemperature.h
index abd54a2239e799875b88c0a612f6a251630d45f6..0ec003faf0be06377c47d78c1079829de162225e 100644
--- a/isis/src/mro/objs/HiCal/GainTemperature.h
+++ b/isis/src/mro/objs/HiCal/GainTemperature.h
@@ -1,28 +1,14 @@
 #ifndef GainTemperature_h
 #define GainTemperature_h
-/**
- * @file
- * $Revision: 1.1 $
- * $Date: 2009/09/15 21:56:44 $
- * $Id: GainTemperature.h,v 1.1 2009/09/15 21:56:44 kbecker Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
diff --git a/isis/src/mro/objs/HiCal/GainUnitConversion.h b/isis/src/mro/objs/HiCal/GainUnitConversion.h
index 6de026f7f786cbf4754d707ee37d09848b58b31a..b40d2ff26b42957b2e176019dd541a0572fb3fd7 100644
--- a/isis/src/mro/objs/HiCal/GainUnitConversion.h
+++ b/isis/src/mro/objs/HiCal/GainUnitConversion.h
@@ -1,28 +1,14 @@
 #ifndef GainUnitConversion_h
 #define GainUnitConversion_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/05/14 21:07:22 $
- * $Id$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
diff --git a/isis/src/mro/objs/HiCal/HiBlob.h b/isis/src/mro/objs/HiCal/HiBlob.h
index b4fabd5ad98c7d1374530f8f7d480d9320c8dc5e..bf9f9c094504e34a88ba2d6ad59cb9cbc8b2d9e3 100644
--- a/isis/src/mro/objs/HiCal/HiBlob.h
+++ b/isis/src/mro/objs/HiCal/HiBlob.h
@@ -1,27 +1,13 @@
 #ifndef HiBlob_h
 #define HiBlob_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/05/12 18:17:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include "Blobber.h"
diff --git a/isis/src/mro/objs/HiCal/HiCalConf.cpp b/isis/src/mro/objs/HiCal/HiCalConf.cpp
index cdc55831d12b5797a962778789161e03932872d2..87383ef6b170fbc6c7012406ea84248a6b723208 100644
--- a/isis/src/mro/objs/HiCal/HiCalConf.cpp
+++ b/isis/src/mro/objs/HiCal/HiCalConf.cpp
@@ -1,26 +1,10 @@
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2009/12/29 23:03:52 $
- * $Id: HiCalConf.cpp,v 1.5 2009/12/29 23:03:52 ehyer Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iostream>
 #include <numeric>
diff --git a/isis/src/mro/objs/HiCal/HiCalConf.h b/isis/src/mro/objs/HiCal/HiCalConf.h
index 1e05f5a2cd64a699c6f617d611fcca50da3fe4ed..43b218de7f43ee90a70ca9e0cee56b7af6debf77 100644
--- a/isis/src/mro/objs/HiCal/HiCalConf.h
+++ b/isis/src/mro/objs/HiCal/HiCalConf.h
@@ -1,28 +1,13 @@
 #ifndef HiCalConf_h
 #define HiCalConf_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/11/18 06:59:48 $
- * $Id: HiCalConf.h,v 1.3 2008/11/18 06:59:48 kbecker Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
diff --git a/isis/src/mro/objs/HiCal/HiCalData.h b/isis/src/mro/objs/HiCal/HiCalData.h
index 41f0e157c84e85b01217462ef7a4c77a02ce0907..fb6443cf577f9572a1d166b31aa6e1ff7f121fda 100644
--- a/isis/src/mro/objs/HiCal/HiCalData.h
+++ b/isis/src/mro/objs/HiCal/HiCalData.h
@@ -1,28 +1,13 @@
 #ifndef HiCalData_h
 #define HiCalData_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/05/14 21:07:22 $
- * $Id: HiCalData.h,v 1.3 2008/05/14 21:07:22 slambright Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <string>
 #include <vector>
@@ -169,5 +154,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
-
diff --git a/isis/src/mro/objs/HiCal/HiCalTypes.h b/isis/src/mro/objs/HiCal/HiCalTypes.h
index 8d4c60fdf7e4664132dcee81fb99d57460ad2721..70e23feeed5b1d1457a32bb0f1bcdf468480977b 100644
--- a/isis/src/mro/objs/HiCal/HiCalTypes.h
+++ b/isis/src/mro/objs/HiCal/HiCalTypes.h
@@ -1,27 +1,14 @@
 #ifndef HiCalTypes_h
 #define HiCalTypes_h
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.1 $
- * $Date: 2008/01/13 08:12:58 $
- *                                                                        
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+                                                                       
 #include <string>
 #include <vector>
 #include <iostream>
@@ -46,7 +33,7 @@ class HiHistory {
      * @brief Output operator for history events
      * @param o Output stream
      * @param h History class to write contents of
-     * 
+     *
      * @return std::ostream& Returns new state of stream
      */
     friend std::ostream &operator<<(std::ostream &o, const HiHistory &h) {
@@ -66,8 +53,8 @@ class HiHistory {
 
     inline int size() const { return (_events.size()); }
     void add(const QString &event) { _events.push_back(event); }
-    QString get(unsigned int index = 0) const { 
-      if (index < _events.size()) { 
+    QString get(unsigned int index = 0) const {
+      if (index < _events.size()) {
         return (_events[index]);
       }
       else {
@@ -82,7 +69,7 @@ class HiHistory {
       for (unsigned int i = 0 ; i < _events.size() ; i++) {
         key.addValue(_events[i]);
       }
-      return (key); 
+      return (key);
     }
 
   private:
diff --git a/isis/src/mro/objs/HiCal/HiCalUtil.h b/isis/src/mro/objs/HiCal/HiCalUtil.h
index 15c86545a78928f63465e517e09fdde3bb2e5840..c9e5f0d5b0d0593b5eb36564275d57d01b427bf8 100644
--- a/isis/src/mro/objs/HiCal/HiCalUtil.h
+++ b/isis/src/mro/objs/HiCal/HiCalUtil.h
@@ -1,27 +1,13 @@
 #ifndef HiCalUtil_h
 #define HiCalUtil_h
-/**
- * @file
- * $Revision: 1.6 $
- * $Date: 2008/11/06 00:08:15 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <cmath>
 #include <string>
diff --git a/isis/src/mro/objs/HiCal/LoadCSV.cpp b/isis/src/mro/objs/HiCal/LoadCSV.cpp
index 209279184f55f9d31acfc876b492860c4cd408c1..f779cb8852c657de66150b25838c65cd5d8b7a17 100644
--- a/isis/src/mro/objs/HiCal/LoadCSV.cpp
+++ b/isis/src/mro/objs/HiCal/LoadCSV.cpp
@@ -1,26 +1,11 @@
-/**
- * @file
- * $Revision$
- * $Date$
- * $Id$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QString>
 #include <vector>
 #include <numeric>
diff --git a/isis/src/mro/objs/HiCal/LoadCSV.h b/isis/src/mro/objs/HiCal/LoadCSV.h
index 0d7a90a514aa0e28a24e5992da01334f8aa3ffe2..39c0f1987e253cdd98d68928d65ca58d3ca5d82a 100644
--- a/isis/src/mro/objs/HiCal/LoadCSV.h
+++ b/isis/src/mro/objs/HiCal/LoadCSV.h
@@ -1,28 +1,14 @@
 #ifndef LoadCSV_h
 #define LoadCSV_h
-/**
- * @file
- * $Revision
- * $Date$
- * $Id$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
@@ -114,4 +100,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
diff --git a/isis/src/mro/objs/HiCal/LowPassFilter.h b/isis/src/mro/objs/HiCal/LowPassFilter.h
index 56e7d1aed3ed9ffc3e08d03f3e5f7f1f9734f28f..3546717ade1d9b319378f1c2a218f9866656c963 100644
--- a/isis/src/mro/objs/HiCal/LowPassFilter.h
+++ b/isis/src/mro/objs/HiCal/LowPassFilter.h
@@ -1,28 +1,13 @@
 #ifndef LowPassFilter_h
 #define LowPassFilter_h
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.1 $
- * $Date: 2008/01/13 08:12:59 $
- * $Id: LowPassFilter.h,v 1.1 2008/01/13 08:12:59 kbecker Exp $
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */                                                                      
 
 #include <string>
 #include <vector>
@@ -37,30 +22,30 @@ namespace Isis {
 
   /**
    * @brief Compute a low pass filter from a Module class content
-   * 
+   *
    * @ingroup Utility
-   * 
+   *
    * @author 2007-10-09 Kris Becker
    */
   class LowPassFilter : public Module {
 
-    public: 
+    public:
       //  Constructors and Destructor
-      LowPassFilter() : Module("LowPassFilter"), _width(3), 
+      LowPassFilter() : Module("LowPassFilter"), _width(3),
                             _iterations(1) { }
-      LowPassFilter(int width, int iterations = 1) : 
+      LowPassFilter(int width, int iterations = 1) :
         Module("LowPassFilter"), _width(width), _iterations(iterations) { }
 
-      LowPassFilter(const Module &c, int width = 3, int iterations = 1) : 
-                        Module("LowPassFilter", c), _width(width), 
+      LowPassFilter(const Module &c, int width = 3, int iterations = 1) :
+                        Module("LowPassFilter", c), _width(width),
                         _iterations(iterations) {
         _data = filterIterator(c.ref(), _width, _iterations);
         _history.add(formHistory());
       }
 
       LowPassFilter(const HiVector &v, const HiHistory &h,
-                        int width = 3, int iterations = 1) : 
-                        Module("LowPassFilter", h), _width(width), 
+                        int width = 3, int iterations = 1) :
+                        Module("LowPassFilter", h), _width(width),
                         _iterations(iterations) {
         _data = filterIterator(v, _width, _iterations);
         _history.add(formHistory());
@@ -82,7 +67,7 @@ namespace Isis {
       int   _iterations;    // Number iterations to apply filter
 
       QString formHistory() {
-        return (QString("LowPassFilter(Width[" + ToString(_width) + 
+        return (QString("LowPassFilter(Width[" + ToString(_width) +
                             "],Iters["+ToString(_iterations)+"])"));
       }
 
@@ -107,4 +92,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
diff --git a/isis/src/mro/objs/HiCal/Module.h b/isis/src/mro/objs/HiCal/Module.h
index 9a8a44dee9a615a745a1d5538d88453eb26fd8f7..37c1ebea552a82dd7dd8f84c747c63eede0d004e 100644
--- a/isis/src/mro/objs/HiCal/Module.h
+++ b/isis/src/mro/objs/HiCal/Module.h
@@ -1,28 +1,13 @@
 #ifndef Module_h
 #define Module_h
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2008/07/16 16:38:00 $
- * $Id: Module.h,v 1.4 2008/07/16 16:38:00 skoechle Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <iostream>
 #include <sstream>
diff --git a/isis/src/mro/objs/HiCal/NonLinearLSQ.cpp b/isis/src/mro/objs/HiCal/NonLinearLSQ.cpp
index 19ebf27e3e1b508606d64473f2709b13abca6def..d8fa31e9b31bc0af94dc834db7556719a98e73ed 100644
--- a/isis/src/mro/objs/HiCal/NonLinearLSQ.cpp
+++ b/isis/src/mro/objs/HiCal/NonLinearLSQ.cpp
@@ -1,26 +1,11 @@
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/02/08 21:31:01 $
- * $Id: NonLinearLSQ.cpp,v 1.2 2008/02/08 21:31:01 kbecker Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <string>
 #include <vector>
 #include <numeric>
diff --git a/isis/src/mro/objs/HiCal/NonLinearLSQ.h b/isis/src/mro/objs/HiCal/NonLinearLSQ.h
index 2d173c7f80d6db228132d11d8a9568cdaed3bdfc..0582416eef46aece9e0beecc65bcfce78b28b12e 100644
--- a/isis/src/mro/objs/HiCal/NonLinearLSQ.h
+++ b/isis/src/mro/objs/HiCal/NonLinearLSQ.h
@@ -1,28 +1,13 @@
 #ifndef NonLinearLSQ_h
 #define NonLinearLSQ_h
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.2 $
- * $Date: 2008/02/08 21:31:01 $
- * $Id: NonLinearLSQ.h,v 1.2 2008/02/08 21:31:01 kbecker Exp $
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */                                                                    
 
 #include <iostream>
 #include <sstream>
@@ -46,11 +31,11 @@ namespace Isis {
 
   /**
    * @brief NonLinearLSQ Computes a fit using a Levenberg-Marquardt algorithm
-   *  
-   * This virtual base class uses the GSL toolkit to apply the 
-   * Levenberg-Marquardt algorithm to fit data to a non-linear equation using 
-   * least squares. 
-   *  
+   *
+   * This virtual base class uses the GSL toolkit to apply the
+   * Levenberg-Marquardt algorithm to fit data to a non-linear equation using
+   * least squares.
+   *
    * @ingroup Utility
    * @author 2007-11-15 Kris Becker
    */
@@ -69,17 +54,17 @@ namespace Isis {
       virtual int nSize() const = 0;
       virtual int nParms() const = 0;
 
-      /** 
+      /**
        * @brief Sets the maximum number of iterations
-       * 
+       *
        * @param m User provides the maximum number iterations
        */
       void setMaxIters(int m) { _maxIters = m; }
 
-      /** 
+      /**
        * @brief Maximum number iterations for valid solution
-       * 
-       * 
+       *
+       *
        * @return int Maximum resolutions
        */
       int maxIters() const { return (_maxIters); }
@@ -99,18 +84,18 @@ namespace Isis {
       /** Check status for success of the given condition  */
       inline bool success(int status) const { return (status == GSL_SUCCESS); }
       /** Return error message pertaining to last fit procesing */
-      inline std::string statusstr() const { 
+      inline std::string statusstr() const {
         return (std::string(gsl_strerror(_status)));
       }
       /** Return error message given status condition */
-      inline std::string statusstr(int status) const { 
+      inline std::string statusstr(int status) const {
         return (std::string(gsl_strerror(status)));
       }
 
       /** Default interation test simply returns input status */
-      virtual int checkIteration(const int Iter, const NLVector &fitcoefs, 
+      virtual int checkIteration(const int Iter, const NLVector &fitcoefs,
                                  const NLVector &uncerts, double cplxconj,
-                                 int Istatus) { 
+                                 int Istatus) {
         return (Istatus);
       }
 
@@ -142,7 +127,7 @@ namespace Isis {
       };
       static int f(const gsl_vector *x, void *params, gsl_vector *fx);
       static int df(const gsl_vector *x, void *params, gsl_matrix *J);
-      static int fdf(const gsl_vector *x, void *params, gsl_vector *fx, 
+      static int fdf(const gsl_vector *x, void *params, gsl_vector *fx,
                      gsl_matrix *J);
 
       NLVector gslToNlsq(const gsl_vector *v) const;
@@ -154,4 +139,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
diff --git a/isis/src/mro/objs/HiCal/SplineFill.h b/isis/src/mro/objs/HiCal/SplineFill.h
index 992f9496ff9567d15a665132761acf7bf3ea6334..bc764009045e88481c45466c6e0297d4bd7b0724 100644
--- a/isis/src/mro/objs/HiCal/SplineFill.h
+++ b/isis/src/mro/objs/HiCal/SplineFill.h
@@ -1,28 +1,13 @@
 #ifndef SplineFill_h
 #define SplineFill_h
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.2 $
- * $Date: 2008/11/06 00:08:15 $
- * $Id: SplineFill.h,v 1.2 2008/11/06 00:08:15 jwalldren Exp $
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */                                                                  
 
 #include <string>
 #include <vector>
@@ -37,31 +22,31 @@ namespace Isis {
 
   /**
    * @brief Compute a low pass filter from a Module class content
-   * 
+   *
    * @ingroup Utility
-   * 
-   * @author 2007-10-09 Kris Becker 
-   * @history 2008-11-05 Jeannie Walldren Replaced references to 
+   *
+   * @author 2007-10-09 Kris Becker
+   * @history 2008-11-05 Jeannie Walldren Replaced references to
    *  DataInterp class with NumericalApproximation.
    */
   class SplineFill : public Module {
 
-    public: 
+    public:
       //  Constructors and Destructor
       SplineFill() : Module("SplineFill"), _filled(0) { }
 
-      SplineFill(const Module &c) : 
+      SplineFill(const Module &c) :
                      Module("SplineFill", c), _filled(0) {
         fill(c.ref());
         _history.add(formHistory());
       }
 
-      SplineFill(const HiVector &v) : 
+      SplineFill(const HiVector &v) :
                      Module("SplineFill"), _filled(0) {
         fill(v);
         _history.add(formHistory());
       }
-      SplineFill(const HiVector &v, const HiHistory &h) : 
+      SplineFill(const HiVector &v, const HiHistory &h) :
                      Module("SplineFill", h), _filled(0) {
         fill(v);
         _history.add(formHistory());
@@ -90,7 +75,7 @@ namespace Isis {
         NumericalApproximation spline(NumericalApproximation::CubicNatural);
         for (int i = 0 ; i < v.dim() ; i++) {
           if (!IsSpecial(v[i])) {
-            spline.AddData(i, v[i]); 
+            spline.AddData(i, v[i]);
           }
         }
 
@@ -99,7 +84,7 @@ namespace Isis {
         _filled = 0;
         for (int j = 0 ; j < v.dim() ; j++) {
           if (IsSpecial(v[j])) {
-            vout[j] = spline.Evaluate(j,NumericalApproximation::NearestEndpoint); 
+            vout[j] = spline.Evaluate(j,NumericalApproximation::NearestEndpoint);
             _filled++;
           }
           else {
@@ -114,4 +99,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
diff --git a/isis/src/mro/objs/HiCal/ZeroBufferFit.cpp b/isis/src/mro/objs/HiCal/ZeroBufferFit.cpp
index 1c9c25f3d4ddd720f475385df5ec62e950056110..8ec893a69d25dd237c04e998f5c0d528387764bc 100644
--- a/isis/src/mro/objs/HiCal/ZeroBufferFit.cpp
+++ b/isis/src/mro/objs/HiCal/ZeroBufferFit.cpp
@@ -1,26 +1,11 @@
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.4 $
- * $Date: 2008/06/11 00:56:51 $
- * $Id: ZeroBufferFit.cpp,v 1.4 2008/06/11 00:56:51 kbecker Exp $
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */ 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
@@ -43,15 +28,15 @@ using namespace std;
 namespace Isis {
 
   /**
-   * @brief Compute second level drift correction (Zf module) 
-   *  
-   * This class provides the second level drift correction that is  
-   * 
-   * 
-   * @param conf 
+   * @brief Compute second level drift correction (Zf module)
+   *
+   * This class provides the second level drift correction that is
+   *
+   *
+   * @param conf
    */
-  ZeroBufferFit::ZeroBufferFit(const HiCalConf &conf) : 
-                             NonLinearLSQ(), Module("ZeroBufferFit") { 
+  ZeroBufferFit::ZeroBufferFit(const HiCalConf &conf) :
+                             NonLinearLSQ(), Module("ZeroBufferFit") {
     DbProfile prof = conf.getMatrixProfile();
     _history.add("Profile["+ prof.Name()+"]");
     _timet.setBin(ToInteger(prof("Summing")));
@@ -77,7 +62,7 @@ namespace Isis {
 
 
     QString histstr = "ZeroBufferFit(AbsErr[" + ToString(_absErr) +
-                          "],RelErr[" + ToString(_relErr) + 
+                          "],RelErr[" + ToString(_relErr) +
                           "],MaxIter[" + ToString(maxIters()) + "])";
    _history.add(histstr);
 
@@ -85,22 +70,22 @@ namespace Isis {
 
   /**
    * @brief Compute non-linear fit to (typically) ZeroBufferSmooth module
-   *  
-   * This method computes a non-linear fit to the result of the 
-   * ZeroBufferSmooth module. There are several things that can go wrong and 
-   * some config conditions that dictate behavior of this process. 
-   *  
-   * Should the image be a short exposure (i.e., not many lines) the fit will 
-   * not succeed so it simply skips this entire module providing the input 
-   * result (d) as the solution.  This wil also occur when the user has selected 
-   * the skip option for the module. 
-   *  
-   * A fit is attempted on the ZeroBufferSmooth data.  The non-linear solution 
-   * must converge within the specifed number of iterations (MaximumIterations) 
-   * or a polynomial fit will be used in leui of a valid solution. 
-   * 
+   *
+   * This method computes a non-linear fit to the result of the
+   * ZeroBufferSmooth module. There are several things that can go wrong and
+   * some config conditions that dictate behavior of this process.
+   *
+   * Should the image be a short exposure (i.e., not many lines) the fit will
+   * not succeed so it simply skips this entire module providing the input
+   * result (d) as the solution.  This wil also occur when the user has selected
+   * the skip option for the module.
+   *
+   * A fit is attempted on the ZeroBufferSmooth data.  The non-linear solution
+   * must converge within the specifed number of iterations (MaximumIterations)
+   * or a polynomial fit will be used in leui of a valid solution.
+   *
    * @param d   ZeroBufferSmooth data solution as input to this method
-   * 
+   *
    * @return HiVector Returns result of the processing
    */
   HiVector ZeroBufferFit::Solve(const HiVector &d) {
@@ -113,7 +98,7 @@ namespace Isis {
       _cc = HiVector(2, 0.0);
       _chisq = 0.0;
       if ( !gotGoodLines(d) ) {
-        hist << "NotEnoughLines(GoodLines[" << goodLines(d) 
+        hist << "NotEnoughLines(GoodLines[" << goodLines(d)
              << "],MinimumLines[" << _minLines << "]);";
       }
 
@@ -133,7 +118,7 @@ namespace Isis {
         _history.add("a1("+ToString(_coefs[1])+"+-"+ToString(_uncert[1])+")");
         _history.add("a2("+ToString(_coefs[2])+"+-"+ToString(_uncert[2])+")");
         _history.add("a3("+ToString(_coefs[3])+"+-"+ToString(_uncert[3])+")");
-      } 
+      }
       else {
         //  Punt, fit a straight line to the data
         _cc = poly_fit(d);
@@ -143,8 +128,8 @@ namespace Isis {
         a[2] = 0.0;
         a[3] = 0.0;
         _coefs = a;
-  
-        hist << "Failed::Reason("<< statusstr() << "),#Iters[" 
+
+        hist << "Failed::Reason("<< statusstr() << "),#Iters["
              << nIterations() << "])";
         _history.add(hist.str().c_str());
         _history.add("a0("+ToString(_coefs[0])+")");
@@ -154,7 +139,7 @@ namespace Isis {
         if ( _useLinFit ) {
           _history.add("OnFailureUse(LinearFit(Zf))");
         }
-        else {  
+        else {
           _skipFit = true;
           _history.add("OnFailureUse(ZfBuffer)");
         }
@@ -163,15 +148,15 @@ namespace Isis {
     return (Yfit());
   }
 
-  /** 
+  /**
    * @brief Compute the initial guess of the fit
-   *  
-   * This method provides the non-linear fit with an initial guess of the 
-   * solution.  It involves a linear fit to the latter half of the data to 
-   * provide the first two coefficents, the difference of the averages of the 
-   * residuals at both ends of the data set and 5 times the last line time as 
-   * the final (fourth) element...a bit involved really. 
-   * 
+   *
+   * This method provides the non-linear fit with an initial guess of the
+   * solution.  It involves a linear fit to the latter half of the data to
+   * provide the first two coefficents, the difference of the averages of the
+   * residuals at both ends of the data set and 5 times the last line time as
+   * the final (fourth) element...a bit involved really.
+   *
    * @return NLVector  4-element vector of the initial guess coefficients
    */
   NonLinearLSQ::NLVector ZeroBufferFit::guess()  {
@@ -217,27 +202,27 @@ namespace Isis {
                           ToString(_guess[1])+ ","+
                           ToString(_guess[2])+ ","+
                           ToString(_guess[3])+ "]");
-    return (g); 
+    return (g);
   }
 
   /**
    * @brief Computes the interation check for convergence
-   *  
+   *
    * @param Iter     Current iteration
    * @param fitcoefs Vector of current fit coefficients
    * @param uncerts  Uncertainties
    * @param cplxconj Complex conjugate of the current iteration
    * @param Istatus  State of current iteration
-   * 
+   *
    * @return int Simply passes on the Istatus value
    */
-  int ZeroBufferFit::checkIteration(const int Iter, const NLVector &fitcoefs, 
+  int ZeroBufferFit::checkIteration(const int Iter, const NLVector &fitcoefs,
                      const NLVector &uncerts, double cplxconj,
-                     int Istatus) { 
+                     int Istatus) {
       _chisq = pow(cplxconj, 2.0);
       return (Istatus);
   }
-                          
+
   /** Computes the function value at the current iteration */
   NonLinearLSQ::NLVector ZeroBufferFit::f_x(const NLVector &a) {
     double a0 = a[0];
@@ -307,14 +292,14 @@ namespace Isis {
 
   /**
    * @brief Compute a polyonomial fit using multivariate statistics
-   *  
-   * Used as a fallback solution, this method computes a linear statistical 
-   * solution from the linear regression analysis of the multivariate statistics 
-   * of the data. 
-   * 
+   *
+   * Used as a fallback solution, this method computes a linear statistical
+   * solution from the linear regression analysis of the multivariate statistics
+   * of the data.
+   *
    * @param d     Data vector to fit
    * @param line0 Current line number in the image
-   * 
+   *
    * @return HiVector Returns the fitted data
    */
   HiVector ZeroBufferFit::poly_fit(const HiVector &d, const double line0) const {
@@ -341,14 +326,12 @@ namespace Isis {
 
     HiVector fit = Yfit();
     for (int i = 0 ; i < _data.dim() ; i++) {
-      o << formatDbl(i) << " " 
+      o << formatDbl(i) << " "
         << formatDbl(_timet(i)) << " "
-        << formatDbl(_data[i]) << " " 
+        << formatDbl(_data[i]) << " "
         << formatDbl(fit[i]) << endl;
     }
     return;
   }
 
 }     // namespace Isis
-
-
diff --git a/isis/src/mro/objs/HiCal/ZeroBufferFit.h b/isis/src/mro/objs/HiCal/ZeroBufferFit.h
index 7ac9bb1a6865fe94ecebf3f07f0fd291123445ba..e2a7621365412e1bc61deadf6ef4c9305c2d7d5a 100644
--- a/isis/src/mro/objs/HiCal/ZeroBufferFit.h
+++ b/isis/src/mro/objs/HiCal/ZeroBufferFit.h
@@ -1,28 +1,14 @@
 #ifndef ZeroBufferFit_h
 #define ZeroBufferFit_h
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.4 $
- * $Date: 2008/05/23 19:15:17 $
- * $Id: ZeroBufferFit.h,v 1.4 2008/05/23 19:15:17 kbecker Exp $
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <string>
 #include <vector>
 
@@ -37,18 +23,18 @@ namespace Isis {
 
   /**
    * @brief Computes non-linear lsq fit of HiRISE Drift (Zd module)
-   * 
+   *
    * This class is best used with individual HiRISE images as the number of
    * lines is critical to proper use.  It is best applied by getting the buffer
-   * as a reference and applying it during systematic processing.  
-   *  
-   * This class models the drift correction using the Levenberg-Marquardt 
-   * algorithm. 
-   * 
+   * as a reference and applying it during systematic processing.
+   *
+   * This class models the drift correction using the Levenberg-Marquardt
+   * algorithm.
+   *
    * @ingroup Utility
-   * 
-   * @author 2007-11-07 Kris Becker 
-   * @internal 
+   *
+   * @author 2007-11-07 Kris Becker
+   * @internal
    *   @history 2008-05-23 Kris Becker Added the ZdOnFailUseLinear option.
    *   @history 2010-10-28 Kris Becker Updated parameter names removing "Zd" and
    *            replacing with "ZeroBufferFit".
@@ -60,49 +46,49 @@ namespace Isis {
     /** Destructor */
     virtual ~ZeroBufferFit() { }
 
-    /** 
+    /**
      * @brief Set binning/summing mode
-     * 
+     *
      * @param bin Summing mode of observatio
      */
     void setBin(int bin) { _timet.setBin(bin); }
 
-    /** 
+    /**
      * @brief Set scan line time
-     * 
+     *
      * @param ltime Scan line time
      */
     void setLineTime(double ltime) { _timet.setLineTime(ltime); }
 
-    /** 
+    /**
      * @brief Returns the size of the data buffer
-     *  
-     * This is the size of the original data buffer. 
-     *  
+     *
+     * This is the size of the original data buffer.
+     *
      * @see nSize()
      * @return int Size of the input buffer
      */
      inline int size() const { return (_data.dim()); }
 
-    /** 
-     * @brief Returns the size of the fitted buffer 
-     *  
-     * \b Important: This returns the size of the buffer being 
+    /**
+     * @brief Returns the size of the fitted buffer
+     *
+     * \b Important: This returns the size of the buffer being
      *    fitted and not the size of original data buffer.  This is
      *    a requirement of the NonLinearLSQ class.  USE WITH
      *    CAUTION!
-     * 
-     * 
+     *
+     *
      * @return int Size of buffer being fitted
      */
     int nSize()  const { return (_b2.dim()); }
 
-    /** 
+    /**
      * @brief Number of parameter to be fitted
-     *  
-     * This is the number of parameters that ZeroBufferFit needs to 
-     * fit.  This method is a requirement of the NonLinearLSQ class. 
-     * 
+     *
+     * This is the number of parameters that ZeroBufferFit needs to
+     * fit.  This method is a requirement of the NonLinearLSQ class.
+     *
      * @return int  Number of parameter to fit
      */
     int nParms() const { return (4); }
@@ -118,7 +104,7 @@ namespace Isis {
 
     HiVector Solve(const HiVector &d);
     NLVector guess();
-    int checkIteration(const int Iter, const NLVector &fitcoefs, 
+    int checkIteration(const int Iter, const NLVector &fitcoefs,
                        const NLVector &uncerts, double cplxconj,
                        int Istatus);
 
@@ -130,7 +116,7 @@ namespace Isis {
     /** Returns the Degrees of Freedom */
     int    DoF()   const { return (nSize() - nParms()); }
 
-    HiVector Yfit() const; 
+    HiVector Yfit() const;
     HiVector Normalize(const HiVector &v);
 
   private:
@@ -157,12 +143,10 @@ namespace Isis {
      /** Returns the number of good lines in the image */
      int goodLines(const HiVector &d) const { return (d.dim() - _badLines); }
      /** Determines if the vector contains any valid lines */
-     bool gotGoodLines(const HiVector &d) const { 
+     bool gotGoodLines(const HiVector &d) const {
        return (goodLines(d) >= _minLines);
      }
-  };               
+  };
 
 }     // namespace Isis
 #endif
-
-
diff --git a/isis/src/mro/objs/HiCal/ZeroBufferSmooth.h b/isis/src/mro/objs/HiCal/ZeroBufferSmooth.h
index 8b91ef8df1876478d13b660db6139f19aa7a2767..3af411485f7edd6626d62e1e1d3c52e56bee04bd 100644
--- a/isis/src/mro/objs/HiCal/ZeroBufferSmooth.h
+++ b/isis/src/mro/objs/HiCal/ZeroBufferSmooth.h
@@ -1,28 +1,14 @@
 #ifndef ZeroBufferSmooth_h
 #define ZeroBufferSmooth_h
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.2 $
- * $Date: 2008/06/13 22:28:55 $
- * $Id: ZeroBufferSmooth.h,v 1.2 2008/06/13 22:28:55 kbecker Exp $
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+                                                                    
 #include <cmath>
 #include <string>
 #include <vector>
@@ -45,50 +31,50 @@ namespace Isis {
 
   /**
    * @brief Processes Buffer calibration data (ZeroBufferSmooth Module)
-   * 
-   * This class loads and processes the Buffer data from a HiRISE image for 
-   * drift correction purposes.  The config file contains parameter 
-   * (ZfFirstSample, ZfLastSample) that indicate which regions of the 
-   * calibration buffer to extract/use.  This region is averaged across the line 
-   * axis for each line resulting in a single value for each line.  The 
-   * resulting vector is then filtered with a lowpass filter. The filter width 
-   * (ZfFilterWidth) and number of interations (ZfFilterIterations) are 
-   * contained within the config file. A spline fit is applied if any missing 
-   * data remain after filtering. 
-   *  
+   *
+   * This class loads and processes the Buffer data from a HiRISE image for
+   * drift correction purposes.  The config file contains parameter
+   * (ZfFirstSample, ZfLastSample) that indicate which regions of the
+   * calibration buffer to extract/use.  This region is averaged across the line
+   * axis for each line resulting in a single value for each line.  The
+   * resulting vector is then filtered with a lowpass filter. The filter width
+   * (ZfFilterWidth) and number of interations (ZfFilterIterations) are
+   * contained within the config file. A spline fit is applied if any missing
+   * data remain after filtering.
+   *
    * @ingroup Utility
-   * 
-   * @author 2008-06-10 Kris Becker 
-   * @internal 
+   *
+   * @author 2008-06-10 Kris Becker
+   * @internal
    *   @history 2010-04-16 Kris Becker Completed documentation
    *   @history 2010-10-28 Kris Becker Renamed parameters removing the "Zf"
    *            prefix and replacing with "ZeroBufferSmooth".
    */
   class ZeroBufferSmooth : public Module {
 
-    public: 
+    public:
       //  Constructors and Destructor
       ZeroBufferSmooth() : Module("ZeroBufferSmooth") { }
       /**
        * @brief Construct with data parameters
-       *  
-       * This constructor completely computes drift from data collected in a 
-       * HiRISE image 
-       * 
+       *
+       * This constructor completely computes drift from data collected in a
+       * HiRISE image
+       *
        * @param cal   Calibration data collection
        * @param conf  All necessary parameters for computations
        */
-      ZeroBufferSmooth(HiCalData &cal, const HiCalConf &conf) : 
-                  Module("ZeroBufferSmooth") { 
+      ZeroBufferSmooth(HiCalData &cal, const HiCalConf &conf) :
+                  Module("ZeroBufferSmooth") {
         init(cal, conf);
       }
 
       /** Destructor */
       virtual ~ZeroBufferSmooth() { }
 
-      /** 
+      /**
        * @brief Return statistics for filtered - raw Buffer
-       * 
+       *
        * @return const Statistics&  Statistics class with all stats
        */
       const Statistics &Stats() const { return (_stats); }
@@ -98,13 +84,13 @@ namespace Isis {
       Statistics _stats;
 
       /**
-       * @brief Workhorse of the zero buffer computation 
-       *  
-       * The default module, assumed to be the Zf module, is retrieved to 
-       * provide parameter necessary to compute the drift correction for a 
-       * HiRISE image. 
-       * 
-       * 
+       * @brief Workhorse of the zero buffer computation
+       *
+       * The default module, assumed to be the Zf module, is retrieved to
+       * provide parameter necessary to compute the drift correction for a
+       * HiRISE image.
+       *
+       *
        * @param cal  Calibration data container/provider
        * @param conf Configuration parameter provider
        */
@@ -136,15 +122,15 @@ namespace Isis {
           }
         }
         _history.add("Statistics(Average["+ToString(_stats.Average())+
-                     "],StdDev["+ToString(_stats.StandardDeviation())+"])"); 
+                     "],StdDev["+ToString(_stats.StandardDeviation())+"])");
         return;
       }
 
       /**
-       * @brief Virtualized parameter reporting method 
-       *  
-       * This method is invoked when dumping the drift correction parameters. 
-       * 
+       * @brief Virtualized parameter reporting method
+       *
+       * This method is invoked when dumping the drift correction parameters.
+       *
        * @param o Output stream to write results to
        */
       virtual void printOn(std::ostream &o) const {
@@ -164,4 +150,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
diff --git a/isis/src/mro/objs/HiCal/ZeroDark.h b/isis/src/mro/objs/HiCal/ZeroDark.h
index f0cd8bbe5a2dd900e13ebe61c706eb7abb2ed237..fecec81cb1d2ca702d43617c04e0d42f926331d2 100644
--- a/isis/src/mro/objs/HiCal/ZeroDark.h
+++ b/isis/src/mro/objs/HiCal/ZeroDark.h
@@ -1,28 +1,14 @@
 #ifndef ZeroDark_h
 #define ZeroDark_h
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2008/06/13 22:28:55 $
- * $Id: ZeroDark.h,v 1.5 2008/06/13 22:28:55 kbecker Exp $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <string>
 #include <vector>
diff --git a/isis/src/mro/objs/HiCal/ZeroReverse.h b/isis/src/mro/objs/HiCal/ZeroReverse.h
index c317fa84c7d2b2934c3e7cc7108a3a721ad73b08..557c6cbb2a779f60bae821fd29902f3afebd9e7f 100644
--- a/isis/src/mro/objs/HiCal/ZeroReverse.h
+++ b/isis/src/mro/objs/HiCal/ZeroReverse.h
@@ -1,28 +1,14 @@
 #ifndef ZeroReverse_h
 #define ZeroReverse_h
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.3 $
- * $Date: 2008/11/18 07:29:12 $
- * $Id: ZeroReverse.h,v 1.3 2008/11/18 07:29:12 kbecker Exp $
- * 
- *   Unless noted otherwise, the portions of Isis written by the USGS are 
- *   public domain. See individual third-party library and package descriptions 
- *   for intellectual property information, user agreements, and related  
- *   information.                                                         
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or   
- *   implied, is made by the USGS as to the accuracy and functioning of such 
- *   software and related material nor shall the fact of distribution     
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.                                        
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html                
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */                                                                       
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+                                                                      
 #include <cmath>
 #include <string>
 #include <vector>
@@ -44,45 +30,45 @@ namespace Isis {
 
   /**
    * @brief Processes Reverse Clock calibration data (ZeroReverse Module)
-   * 
+   *
    * This class loads and processes the Reverse Clock data from a  HiRISE image
-   * for offset correction purposes.   Additional processing may occur in 
-   * subsequent modules. 
-   *  
+   * for offset correction purposes.   Additional processing may occur in
+   * subsequent modules.
+   *
    * @ingroup Utility
-   * 
-   * @author 2008-06-13 Kris Becker 
-   * @internal 
+   *
+   * @author 2008-06-13 Kris Becker
+   * @internal
    *   @history 2010-04-16 Kris Becker Renamed from Zf to ZeroReverse
    *   @history 2010-10-28 Kris Becker Renamed parameters replacing "Zz" with
    *            "ZeroReverse".
    */
   class ZeroReverse : public Module {
 
-    public: 
+    public:
       //  Constructors and Destructor
       ZeroReverse() : Module("ZeroReverse") { }
-      ZeroReverse(HiCalData &cal, const HiCalConf &conf) : 
-                  Module("ZeroReverse") { 
+      ZeroReverse(HiCalData &cal, const HiCalConf &conf) :
+                  Module("ZeroReverse") {
         init(cal, conf);
       }
 
       /** Destructor */
       virtual ~ZeroReverse() { }
 
-      /** 
+      /**
        * @brief Return statistics for raw Reverse Clock buffer
-       * 
+       *
        * @return const Statistics&  Statistics class with all stats
        */
       const Statistics &Stats() const { return (_stats); }
 
       /**
        * @brief Specifies if the input trigger conditions were met
-       *  
-       * If trigger conditions where met, the reverse clock correction becomes a 
-       * constant as opposed to processed reverse clock pixels. 
-       * 
+       *
+       * If trigger conditions where met, the reverse clock correction becomes a
+       * constant as opposed to processed reverse clock pixels.
+       *
        * @return bool True if triggered, false otherwise
        */
       bool wasTriggered() const { return (_triggered); }
@@ -94,12 +80,12 @@ namespace Isis {
 
 
       /**
-       * @brief Initialize and compute data solution 
-       *  
-       * 
+       * @brief Initialize and compute data solution
+       *
+       *
        * @author Kris Becker - 4/16/2010
-       * 
-       * @param cal  HiRISE calibration data provided 
+       *
+       * @param cal  HiRISE calibration data provided
        * @param conf Configuration data provider
        */
       void init(HiCalData &cal, const HiCalConf &conf) {
@@ -117,14 +103,14 @@ namespace Isis {
 
         _revClock = averageLines(revclk);
        _history.add("RevClock(CropLines["+ToString(line0)+","+ToString(lineN) +
-                    "],Mean["+ToString(_stats.Average()) + 
+                    "],Mean["+ToString(_stats.Average()) +
                      "],StdDev["+ToString(_stats.StandardDeviation()) +
                      "],LisPixels["+ToString(_stats.LisPixels())+
                      "],HisPixels["+ToString(_stats.HisPixels()) +
                      "],NulPixels["+ToString(_stats.NullPixels())+ "])");
 
        DbAccess triggers(Pvl(tfile).findObject("ReverseClockStatistics"));
-       QString tprofName = conf.resolve("{FILTER}{CCD}_{CHANNEL}_{BIN}",prof); 
+       QString tprofName = conf.resolve("{FILTER}{CCD}_{CHANNEL}_{BIN}",prof);
        _history.add("ReverseClockStatistics(File["+tfile+
                     "],Profile["+tprofName+"])");
 
@@ -144,12 +130,12 @@ namespace Isis {
                       "],RevNulTolerance["+ToString(nulTol)+ "])");
 
          if ((_stats.LisPixels() > lisTol) || (_stats.HisPixels() > hisTol) ||
-             (_stats.NullPixels() > nulTol) || 
-             (_stats.StandardDeviation() > revstddev)) { 
+             (_stats.NullPixels() > nulTol) ||
+             (_stats.StandardDeviation() > revstddev)) {
            _triggered = true;
            _data = HiVector(_revClock.dim1(), revmean);
            _history.add("Trigger(True - Reverse Clock set to constant,"
-                        "ReverseClock["+ToString(revmean)+"])"); 
+                        "ReverseClock["+ToString(revmean)+"])");
          }
          else {
            _history.add("Trigger(False - Reverse Clock processing invoked)");
@@ -188,4 +174,3 @@ namespace Isis {
 
 }     // namespace Isis
 #endif
-
diff --git a/isis/src/mro/objs/HiEqualization/HiEqualization.cpp b/isis/src/mro/objs/HiEqualization/HiEqualization.cpp
index 9f0474a4ff032479a5a40e8d2433367eb80f7935..3f77f4e6ca7a654a1475a32ad4c37556ad91308b 100644
--- a/isis/src/mro/objs/HiEqualization/HiEqualization.cpp
+++ b/isis/src/mro/objs/HiEqualization/HiEqualization.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "HiEqualization.h"
 
 #include <iomanip>
diff --git a/isis/src/mro/objs/HiEqualization/HiEqualization.h b/isis/src/mro/objs/HiEqualization/HiEqualization.h
index 11e6f2deaac708c249abd0c3c35efe961b432d07..2caa8b74c29bb24c0fec42f99a9a6c35aacb19dd 100644
--- a/isis/src/mro/objs/HiEqualization/HiEqualization.h
+++ b/isis/src/mro/objs/HiEqualization/HiEqualization.h
@@ -1,27 +1,13 @@
 #ifndef HiEqualization_h
 #define HiEqualization_h
 
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2009/11/25 22:09:21 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Equalization.h"
 
@@ -51,7 +37,7 @@ namespace Isis {
        * @author ????-??-?? Unknown
        *
        * @internal
-       *   @history 2012-11-30 Tracie Sucharski - Removed unused include file Projection.h.  This 
+       *   @history 2012-11-30 Tracie Sucharski - Removed unused include file Projection.h.  This
        *                           change was made in reference to #775
        *   @histroy 2016-07-15 Ian Humphrey - Modified calculateStatisics() to set the solved state
        *                           to true to reflect changes to Equalization. References #2282.
diff --git a/isis/src/mro/objs/HiEqualization/unitTest.cpp b/isis/src/mro/objs/HiEqualization/unitTest.cpp
index 8b48299eccc88ec2b51738271a2180ba18f89ffe..a4a453d726e7f588084e3ce0e12c93835c115c94 100644
--- a/isis/src/mro/objs/HiEqualization/unitTest.cpp
+++ b/isis/src/mro/objs/HiEqualization/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 
 #include "Buffer.h"
@@ -73,4 +81,3 @@ int main(int argc, char *argv[]) {
     e.print();
   }
 }
-
diff --git a/isis/src/mro/objs/HiLab/HiLab.cpp b/isis/src/mro/objs/HiLab/HiLab.cpp
index 84eb74a360c4270b8706f8d431caebca9a994b01..6b124dda82359a24ed4b4f15bf144d1b34004ac5 100644
--- a/isis/src/mro/objs/HiLab/HiLab.cpp
+++ b/isis/src/mro/objs/HiLab/HiLab.cpp
@@ -1,21 +1,10 @@
-/**
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "HiLab.h"
 #include "IException.h"
@@ -25,13 +14,13 @@ using namespace std;
 namespace Isis {
   /**
    * Constructs a HiLab Object
-   * @param cube The cube containing the HiRise labels to be processed. 
+   * @param cube The cube containing the HiRise labels to be processed.
    */
   HiLab::HiLab(Cube *cube) {
     PvlGroup group = cube->group("Instrument");
     p_cpmmNumber = group["CpmmNumber"];
     p_channel = group["ChannelNumber"];
-  
+
     if(group.hasKeyword("Summing")) {
       p_bin = group["Summing"];
     }
@@ -39,7 +28,7 @@ namespace Isis {
       std::string msg = "Cannot find required Summing keyword in label";
       throw IException(IException::Io, msg, _FILEINFO_);
     }
-  
+
     if(group.hasKeyword("Tdi")) {
       p_tdi = group["Tdi"];
     }
diff --git a/isis/src/mro/objs/HiLab/HiLab.h b/isis/src/mro/objs/HiLab/HiLab.h
index aabff1581418674c6eb88f1dbb9db7264c944c9b..8e50c992b798441728c07858371065e7d2e35df7 100644
--- a/isis/src/mro/objs/HiLab/HiLab.h
+++ b/isis/src/mro/objs/HiLab/HiLab.h
@@ -1,26 +1,13 @@
 #ifndef hiLab_h
 #define hiLab_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/05/14 21:07:26 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Cube.h"
 #include "Pvl.h"
diff --git a/isis/src/mro/objs/HiLab/unitTest.cpp b/isis/src/mro/objs/HiLab/unitTest.cpp
index af49e4f0166a36600b30980bb6f4d9997cfd477c..e2406eaa3b2b3c79b475d5f3854f378fb68c6f75 100644
--- a/isis/src/mro/objs/HiLab/unitTest.cpp
+++ b/isis/src/mro/objs/HiLab/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 
 #include "HiLab.h"
diff --git a/isis/src/mro/objs/HiriseCamera/HiriseCamera.cpp b/isis/src/mro/objs/HiriseCamera/HiriseCamera.cpp
index 24deec3495b054d0cc9f88a03e8dd203aae2c56e..2de6a3f92a9e304cd6b3dcdced57dbf3f843c626 100644
--- a/isis/src/mro/objs/HiriseCamera/HiriseCamera.cpp
+++ b/isis/src/mro/objs/HiriseCamera/HiriseCamera.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2009/08/31 15:12:31 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "HiriseCamera.h"
 
@@ -41,7 +27,7 @@ namespace Isis {
    * Creates a Hirise Camera Model
    *
    * @param lab Pvl label from the iamge
-   * @internal 
+   * @internal
    *   @history 2011-05-03 Jeannie Walldren - Added NAIF error check.
    */
   HiriseCamera::HiriseCamera(Cube &cube) : LineScanCamera(cube) {
@@ -49,7 +35,7 @@ namespace Isis {
     m_instrumentNameShort = "HiRISE";
     m_spacecraftNameLong = "Mars Reconnaissance Orbiter";
     m_spacecraftNameShort = "MRO";
-    
+
     NaifStatus::CheckErrors();
     // Setup camera characteristics from instrument and frame kernel
     SetFocalLength();
diff --git a/isis/src/mro/objs/HiriseCamera/HiriseCamera.h b/isis/src/mro/objs/HiriseCamera/HiriseCamera.h
index db69f243d410bf50bb4a8b044eb9760a109764f9..fe15e33a0470af48d4e012b0ddb1cbc9c905a1b5 100644
--- a/isis/src/mro/objs/HiriseCamera/HiriseCamera.h
+++ b/isis/src/mro/objs/HiriseCamera/HiriseCamera.h
@@ -1,26 +1,13 @@
 #ifndef HiriseCamera_h
 #define HiriseCamera_h
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2009/08/31 15:12:31 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -48,12 +35,12 @@ namespace Isis {
    *                           inherit directly from Camera
    *   @history 2011-05-03 Jeannie Walldren - Updated unitTest to test for new
    *                           methods. Added NAIF error check. Removed Mro namespace.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -67,24 +54,24 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-74000); }
 
-      /** 
+      /**
        *  CK Reference ID - MRO_MME_OF_DATE
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (-74900); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/mro/objs/HiriseCamera/unitTest.cpp b/isis/src/mro/objs/HiriseCamera/unitTest.cpp
index d2e64e57f1725d54be2df13b4e467c59562ae2b6..2d2dfd5666bfca698e8f7b5115e5415373420260 100644
--- a/isis/src/mro/objs/HiriseCamera/unitTest.cpp
+++ b/isis/src/mro/objs/HiriseCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -59,7 +48,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -127,4 +116,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/mro/objs/MarciCamera/MarciCamera.cpp b/isis/src/mro/objs/MarciCamera/MarciCamera.cpp
index d1de855f10c94c5408642a55b9db572a1a6392ab..d73bedbe5314908080190058f49e7a1436fdf528 100644
--- a/isis/src/mro/objs/MarciCamera/MarciCamera.cpp
+++ b/isis/src/mro/objs/MarciCamera/MarciCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 
 #include "MarciCamera.h"
@@ -214,8 +203,8 @@ namespace Isis {
 
   /**
    * CK frame ID -  - Instrument Code from spacit run on CK
-   *  
-   * @return @b int The appropriate instrument code for the "Camera-matrix" 
+   *
+   * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Frame ID
    */
   int MarciCamera::CkFrameId() const {
@@ -224,9 +213,9 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    * CK Reference ID - MRO_MME_OF_DATE
-   * 
+   *
    * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Reference ID
    */
@@ -236,10 +225,10 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    *  SPK Reference ID - J2000
-   *  
-   * @return @b int The appropriate instrument code for the Spacecraft 
+   *
+   * @return @b int The appropriate instrument code for the Spacecraft
    *         Kernel Reference ID
    */
   int MarciCamera::SpkReferenceId() const {
diff --git a/isis/src/mro/objs/MarciCamera/MarciCamera.h b/isis/src/mro/objs/MarciCamera/MarciCamera.h
index cd2e9e044c241542954d03208b12137a1c57431b..7a0fdeb4636f0a744f764cfb3e2f4c1cf83d3029 100644
--- a/isis/src/mro/objs/MarciCamera/MarciCamera.h
+++ b/isis/src/mro/objs/MarciCamera/MarciCamera.h
@@ -1,25 +1,13 @@
 #ifndef MarciCamera_h
 #define MarciCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "PushFrameCamera.h"
 
@@ -48,7 +36,7 @@ namespace Isis {
    *                           documentation. Removed Mro namespace wrap inside Isis namespace.
    *                           Added Isis Disclaimer to files. Added NAIF error
    *                           check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
    *   @history 2014-04-17 Jeannie Backer - Updated due to method name change in
    *                           PushFrameCameraDetectorMap. Moved method implementations to cpp file.
@@ -56,7 +44,7 @@ namespace Isis {
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -89,4 +77,3 @@ namespace Isis {
   };
 };
 #endif
-
diff --git a/isis/src/mro/objs/MarciCamera/MarciDistortionMap.cpp b/isis/src/mro/objs/MarciCamera/MarciDistortionMap.cpp
index 447fd9cf261eb7d0d69d6227b5f4e5451398b409..82e3ead4d6143a63d728834ddbf1bdf2b3e09ee3 100644
--- a/isis/src/mro/objs/MarciCamera/MarciDistortionMap.cpp
+++ b/isis/src/mro/objs/MarciCamera/MarciDistortionMap.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/11/24 16:40:30 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 
 #include "IString.h"
@@ -194,4 +180,3 @@ namespace Isis {
     return uX;
   }
 }
-
diff --git a/isis/src/mro/objs/MarciCamera/MarciDistortionMap.h b/isis/src/mro/objs/MarciCamera/MarciDistortionMap.h
index 485df7583c59e5b637df227edb1daceed9a88d70..6c3fea11f8f2133836d7f116c6605fa870b05019 100644
--- a/isis/src/mro/objs/MarciCamera/MarciDistortionMap.h
+++ b/isis/src/mro/objs/MarciCamera/MarciDistortionMap.h
@@ -1,33 +1,19 @@
 #ifndef MarciDistortionMap_h
 #define MarciDistortionMap_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/11/24 16:40:31 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 #include "CameraDistortionMap.h"
 
 namespace Isis {
-  /** 
+  /**
    *  Distort/undistort focal plane coordinates
    *
    * Creates a map for adding/removing optical distortions
@@ -42,7 +28,7 @@ namespace Isis {
    *
    * @internal
    *   @history 2011-05-03 Jeannie Walldren - Updated documentation.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
    */
   class MarciDistortionMap : public CameraDistortionMap {
diff --git a/isis/src/mro/objs/MarciCamera/unitTest.cpp b/isis/src/mro/objs/MarciCamera/unitTest.cpp
index 225300fec2de12117489d500bfadc59eadac348e..d8a9e00f9d76de9873a5a5a027abcd311da6ad0b 100644
--- a/isis/src/mro/objs/MarciCamera/unitTest.cpp
+++ b/isis/src/mro/objs/MarciCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -60,7 +49,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -128,4 +117,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/near/apps/msi2isis/main.cpp b/isis/src/near/apps/msi2isis/main.cpp
index b55a0631f5dc04c91f4c896c35070cf5d12a03b8..7e328aca84099d9188bdc960bc68ec628617eb41 100644
--- a/isis/src/near/apps/msi2isis/main.cpp
+++ b/isis/src/near/apps/msi2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QString>
diff --git a/isis/src/near/objs/MsiCamera/MsiCamera.cpp b/isis/src/near/objs/MsiCamera/MsiCamera.cpp
index e0e24916493cc38090d0d083ce2274abba471240..cc2f2ebdba5dfc08f0e4e5be082a2ae4827933f6 100644
--- a/isis/src/near/objs/MsiCamera/MsiCamera.cpp
+++ b/isis/src/near/objs/MsiCamera/MsiCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "MsiCamera.h"
 
 #include <QString>
@@ -75,7 +64,7 @@ namespace Isis {
     // Setup focal plane map
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
 
-    // Make sure to grab lines and samples in the correct order. 
+    // Make sure to grab lines and samples in the correct order.
     double line = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE");
     double sample = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_SAMPLE");
     focalMap->SetDetectorOrigin(sample, line);
diff --git a/isis/src/near/objs/MsiCamera/MsiCamera.h b/isis/src/near/objs/MsiCamera/MsiCamera.h
index 7b15d470efb450ea9457949f1599ee48b90cc67d..1892386736f0eb89eec46ec8ed90fdab549ef1b5 100644
--- a/isis/src/near/objs/MsiCamera/MsiCamera.h
+++ b/isis/src/near/objs/MsiCamera/MsiCamera.h
@@ -1,23 +1,13 @@
 #ifndef MsiCamera_h
-#define MsiCamera_h
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "FramingCamera.h"
 
 namespace Isis {
@@ -47,7 +37,7 @@ namespace Isis {
    *                           since Camera now handles this. References #2335.
    *   @history 2016-09-14 Kelvin Rodriguez - Enforced the order in which BORESIGHT_LINE and
    *                           BORESIGHT_SAMPLE are added to the PVL. Part of porting to
-   *                           OSX 10.11 
+   *                           OSX 10.11
    */
   class MsiCamera : public FramingCamera {
     public:
diff --git a/isis/src/near/objs/MsiCamera/unitTest.cpp b/isis/src/near/objs/MsiCamera/unitTest.cpp
index d544b9546736dfde60232e962812b536fcac01df..f58ec83a884c7ba4fa2e1fac7cc1cd71062a037d 100644
--- a/isis/src/near/objs/MsiCamera/unitTest.cpp
+++ b/isis/src/near/objs/MsiCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -59,16 +48,16 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
     cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
     cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
-    double exposureDuration = ((double) inst["ExposureDuration"])/1000; 
+    double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
     double et; // StartTime keyword is the center exposure time
     str2et_c(stime.toLatin1().data(), &et);
@@ -139,4 +128,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp
index 700981c83209720ae7f7df615256599387f70d8c..0a3c76872e39f40634dddf55dee40941da8e3356 100644
--- a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp
+++ b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "leisa2isis.h"
 
 #include "Cube.h"
diff --git a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.h b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.h
index af490c0c6867c379650de34423a50b84d69f05ef..d596f164190e1071fc84cd8b59b5bf5a92a261d9 100644
--- a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.h
+++ b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.h
@@ -1,6 +1,14 @@
 #ifndef leisa2isis_h
 #define leisa2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Pvl.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/newhorizons/apps/leisa2isis/main.cpp b/isis/src/newhorizons/apps/leisa2isis/main.cpp
index 3321f6c1045a8cf226b8f6f59536a1218e3f5ec4..09d67f3df9b2fda8b3af9e28a4b7db7aede55b2a 100644
--- a/isis/src/newhorizons/apps/leisa2isis/main.cpp
+++ b/isis/src/newhorizons/apps/leisa2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "leisa2isis.h"
@@ -20,7 +28,7 @@ void IsisMain() {
     }
     throw;
   }
-  
+
   for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {
     Application::Log(*grpIt);
   }
diff --git a/isis/src/newhorizons/apps/lorri2isis/main.cpp b/isis/src/newhorizons/apps/lorri2isis/main.cpp
index 567b0b5d6465a117fe062f6e2af388c35bb9b938..3d4645b83de7e7f80e5ea116e3bb1127886cf65c 100644
--- a/isis/src/newhorizons/apps/lorri2isis/main.cpp
+++ b/isis/src/newhorizons/apps/lorri2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Cube.h"
diff --git a/isis/src/newhorizons/apps/mvic2isis/main.cpp b/isis/src/newhorizons/apps/mvic2isis/main.cpp
index 1a016dddd21f3f69f899e5d173d36a2433691529..18521d44559cba298dde43503bedf22adf14ed5b 100644
--- a/isis/src/newhorizons/apps/mvic2isis/main.cpp
+++ b/isis/src/newhorizons/apps/mvic2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "mvic2isis.h"
diff --git a/isis/src/newhorizons/apps/mvic2isis/mvic2isis.cpp b/isis/src/newhorizons/apps/mvic2isis/mvic2isis.cpp
index b29d5592ac9ec48e31dba6d4c59002d4bb39b57e..4c5233748c3e9517f5e0373057c09d840683674d 100644
--- a/isis/src/newhorizons/apps/mvic2isis/mvic2isis.cpp
+++ b/isis/src/newhorizons/apps/mvic2isis/mvic2isis.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "mvic2isis.h"
 
 #include <fstream>
diff --git a/isis/src/newhorizons/apps/mvic2isis/mvic2isis.h b/isis/src/newhorizons/apps/mvic2isis/mvic2isis.h
index f725788403551c01b15a96a2684e1fd38c388fe3..77d71d7e2078229b92ec286cf657f4933035f126 100644
--- a/isis/src/newhorizons/apps/mvic2isis/mvic2isis.h
+++ b/isis/src/newhorizons/apps/mvic2isis/mvic2isis.h
@@ -1,6 +1,14 @@
 #ifndef mvic2isis_h
 #define mvic2isis_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Pvl.h"
 #include "UserInterface.h"
 
diff --git a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.cpp b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.cpp
index 6bd8d465520124eae4b639b26204987c0929fbf6..52eafb7e195273143a1e3adc7bf920582d2eed0c 100644
--- a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "NewHorizonsLeisaCamera.h"
 
@@ -38,11 +26,11 @@ namespace Isis {
   /**
    * Constructs a New Horizons LEISA LineScanCamera object. LEISA is technically a frame
    * type camera, but it has the etalon filer in front of it exposing each line of a frame to have a
-   * different wavelength, so we treat it like a linescan camera. Each band of the ISIS cube is made 
-   * by combining all the corresponding frame line numbers into that band (i.e., All the line number 
-   * 1s from each frame in an observatoin are combined into band 1, all line number 2s are put into 
-   * band 2, and so on) 
-   * 
+   * different wavelength, so we treat it like a linescan camera. Each band of the ISIS cube is made
+   * by combining all the corresponding frame line numbers into that band (i.e., All the line number
+   * 1s from each frame in an observatoin are combined into band 1, all line number 2s are put into
+   * band 2, and so on)
+   *
    * @param something Description
    *
    * @author Kristin Berry
@@ -53,9 +41,9 @@ namespace Isis {
     m_instrumentNameShort = "LEISA";
     m_spacecraftNameLong = "New Horizons";
     m_spacecraftNameShort = "NewHorizons";
-    
-    // Override the SPICE error process for SPICE calls 
-    NaifStatus::CheckErrors(); 
+
+    // Override the SPICE error process for SPICE calls
+    NaifStatus::CheckErrors();
 
     SetFocalLength();
     SetPixelPitch();
@@ -65,9 +53,9 @@ namespace Isis {
     QString expDuration = inst["ExposureDuration"];
 
     QString stime = inst["SpacecraftClockStartCount"];
-    double m_etStart = getClockTime(stime).Et(); 
-    
-    // The line rate is set to the time between each frame since we are treating LEASA as a linescan    
+    double m_etStart = getClockTime(stime).Et();
+
+    // The line rate is set to the time between each frame since we are treating LEASA as a linescan
     double m_lineRate = expDuration.toDouble();
 
     // The detector map tells us how to convert from image coordinates to
@@ -106,27 +94,27 @@ namespace Isis {
       m_originalBand.append(toInt(orgBand[i]));
     }
 
-    // Use the defualt no correction distortion map. 
+    // Use the defualt no correction distortion map.
     new CameraDistortionMap(this);
 
     // Setup the ground and sky map
     new LineScanCameraGroundMap(this);
     new LineScanCameraSkyMap(this);
 
-    LoadCache();  
+    LoadCache();
 
     // Check to see if there were any SPICE errors
-    NaifStatus::CheckErrors();  
+    NaifStatus::CheckErrors();
   }
 
 
   /**
-   * Change the New Horizons camera parameters based on the band number 
+   * Change the New Horizons camera parameters based on the band number
    *
    * @param vband The band number to set
    *
-   * @author 2014-09-24 Stuart Sides 
-   *  
+   * @author 2014-09-24 Stuart Sides
+   *
    */
   void NewHorizonsLeisaCamera::SetBand(const int vband) {
     if ( (vband < 1) || (vband > m_originalBand.size())) {
@@ -138,7 +126,7 @@ namespace Isis {
     int band;
     band = m_originalBand[vband-1];
     Camera::SetBand(vband);
-    
+
     // Get the affine coefficients from the focal plane map and adjust the constant terms to
     // provide the correct Y/Line offset for this band
     QVector<double> temp;
@@ -172,15 +160,14 @@ namespace Isis {
 
 
 /**
- * This is the function that is called in order to instantiate a 
- * NewHorizonsLeisaCamera object. 
+ * This is the function that is called in order to instantiate a
+ * NewHorizonsLeisaCamera object.
  *
  * @param lab Cube labels
  *
  * @return Isis::Camera* NewHorizonsLeisaCamera
- * 
+ *
  */
 extern "C" Isis::Camera *NewHorizonsLeisaCameraPlugin(Isis::Cube &cube) {
   return new Isis::NewHorizonsLeisaCamera(cube);
 }
-
diff --git a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.h b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.h
index b0e1c53c45bbc9fe88ae5244805dcab397ec00a5..3d6e7d6198c5fd9fb1a0afc66598c7bc374c90f9 100644
--- a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.h
+++ b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.h
@@ -1,24 +1,13 @@
 #ifndef NewHorizonsLeisaCamera_h
 #define NewHorizonsLeisaCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -26,8 +15,8 @@
 
 namespace Isis {
   /**
-   * This is the camera model for LEISA, New Hoirzon's infrared 
-   * Spectrometer.  
+   * This is the camera model for LEISA, New Hoirzon's infrared
+   * Spectrometer.
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup New Horizons
@@ -40,7 +29,7 @@ namespace Isis {
    *                           name methods.
    * @history 2015-08-26 Kristin Berry - Updated error condition in SetBand and
    *                          Camera::SetBand call to set the virtual band.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -52,31 +41,31 @@ namespace Isis {
       //! Destroys the NewHorizonsLeisaCamera object
       ~NewHorizonsLeisaCamera() {};
 
-      //! Flag that NewHorizonsLeisaCamera is band-dependent. 
+      //! Flag that NewHorizonsLeisaCamera is band-dependent.
       bool IsBandIndependent() {
         return false;
       };
 
        /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-98000); }//from NAIF_INSTRUMENT_ID in /usgs/cpkgs/isis3/data/newhorizons/kernels/ck/*.lbl or spacit R or spacit S on ck
 
-      /** 
-       *  CK Reference ID - 
-       * 
-       * @return @b int The appropriate code for the "Camera-matrix"  
+      /**
+       *  CK Reference ID -
+       *
+       * @return @b int The appropriate code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); } //can get from spacit S on ck
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); } //can get from spacit S on spk
diff --git a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/unitTest.cpp b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/unitTest.cpp
index 646fca8dcf3063662af5017b081328bde2588ea1..95a3f14bc72a59796e49446691063412d6b1edc4 100644
--- a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/unitTest.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -43,7 +32,7 @@ int main(void) {
     // set both the known lat and known lon to zero and copy the unit test output "Latitude off by: "
     // and "Longitude off by: " values directly into these variables. -- in progress
     double knownLat = 12.5782232447537528;
-    double knownLon = 23.5337593470257218; 
+    double knownLon = 23.5337593470257218;
 
     Cube c("$ISISTESTDATA/isis/src/newhorizons/unitTestData/lsb_0034933739_0x53c_sci_1.cub", "r");
     NewHorizonsLeisaCamera *cam = (NewHorizonsLeisaCamera *) CameraFactory::Create(c);
@@ -58,7 +47,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -107,12 +96,12 @@ int main(void) {
       cout << "Longitude OK" << endl << endl;
     }
     else {
-      cout << setprecision(16) << "Longitude off by: " << 
+      cout << setprecision(16) << "Longitude off by: " <<
               cam->UniversalLongitude() - knownLon << endl << endl;
     }
 
     // Test the band dependent flag getter
-    cout << "The bands of this camera have different gemometry for each band = " << 
+    cout << "The bands of this camera have different gemometry for each band = " <<
             !cam->IsBandIndependent() << endl << endl;
 
 
@@ -151,5 +140,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "  Error in SetImage (" << samp << ", " << line << ")" << endl << endl;
   }
 }
-
-
diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.cpp b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.cpp
index 1736151f1fab4c2582191c989bb851888870ebf9..b115e1e1673cc7c2d32edaec73e12f682789decd 100644
--- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "NewHorizonsLorriCamera.h"
 
@@ -36,16 +24,16 @@ using namespace std;
 
 namespace Isis {
   /**
-   * Constructs a New Horizons LORRI Framing Camera object. The LORRI camera has two summing modes, 
-   * 1x1 and 4x4. The handeling of these two modes is done through two different Naif codes, 
-   * -98301 and -98302 respectivly. This camera model code handles both cameras. The 
-   * IK and IAK kernels must supply keyword values for both codes. The cube labels show a summing 
-   * mode, but the value is not used 
+   * Constructs a New Horizons LORRI Framing Camera object. The LORRI camera has two summing modes,
+   * 1x1 and 4x4. The handeling of these two modes is done through two different Naif codes,
+   * -98301 and -98302 respectivly. This camera model code handles both cameras. The
+   * IK and IAK kernels must supply keyword values for both codes. The cube labels show a summing
+   * mode, but the value is not used
    *
    * @param lab Pvl label from a New Horizons LORRI Framing Camera image.
    *
-   * @author Stuart Sides 
-   *  
+   * @author Stuart Sides
+   *
    * @internal
    */
 
@@ -54,19 +42,19 @@ namespace Isis {
     m_instrumentNameShort = "LORRI";
     m_spacecraftNameLong = "New Horizons";
     m_spacecraftNameShort = "NewHorizons";
-    
+
     NaifStatus::CheckErrors();
 
-    // The LORRI focal length is fixed and is designed not to change throught the operational 
-    // temperature. The NAIF code, set in the ISIS labels, will be used to read a single focal 
-    // length from the SPICE kernels. Version 100 of the Lorri IK uses meters for focal length, 
+    // The LORRI focal length is fixed and is designed not to change throught the operational
+    // temperature. The NAIF code, set in the ISIS labels, will be used to read a single focal
+    // length from the SPICE kernels. Version 100 of the Lorri IK uses meters for focal length,
     // units, version 200 uses mm, and has a units keyword.
     QString unitsKey = "INS" + toString(naifIkCode()) + "_FOCAL_LENGTH_UNITS";
     QString focalLengthUnits = Spice::getString(unitsKey);
     if (focalLengthUnits != "mm") {
       QString msg = QObject::tr("SPICE keyword [%1] is expected to be mm. [%2] was found instead").
                     arg(unitsKey).arg(focalLengthUnits);
-       throw IException(IException::User, msg, _FILEINFO_);      
+       throw IException(IException::User, msg, _FILEINFO_);
     }
     SetFocalLength(Spice::getDouble("INS" + toString(naifIkCode()) + "_FOCAL_LENGTH"));
 
@@ -87,7 +75,7 @@ namespace Isis {
     // out the affine transforms from detector samp,line to focal plane x,y.
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
 
-    // The boresight position recorded in the IK is zero-based and therefore needs to be adjusted 
+    // The boresight position recorded in the IK is zero-based and therefore needs to be adjusted
     // for ISIS
     double boresightSample = Spice::getDouble("INS" + toString(naifIkCode()) + "_CCD_CENTER",0) + 1.0;
     double boresightLine = Spice::getDouble("INS" + toString(naifIkCode()) + "_CCD_CENTER",1) + 1.0;
@@ -103,7 +91,7 @@ namespace Isis {
     QString e2("INS" + toString(naifIkCode()) + "_OOC_EM");
     QString e5("INS" + toString(naifIkCode()) + "_OOC_EM");
     QString e6("INS" + toString(naifIkCode()) + "_OOC_EM");
-    new NewHorizonsLorriDistortionMap(this, getDouble(e2, 0), getDouble(e5, 1), 
+    new NewHorizonsLorriDistortionMap(this, getDouble(e2, 0), getDouble(e5, 1),
                                       getDouble(e6, 2), -1);
 
     // Setup the ground and sky map
@@ -126,10 +114,10 @@ namespace Isis {
   }
 
   /**
-   * Returns the shutter open and close times.  The LORRI camera doesn't use a shutter to start and 
+   * Returns the shutter open and close times.  The LORRI camera doesn't use a shutter to start and
    * end an observation, but this function is being used to get the observation start and end times,
-   * so we will simulate a shutter. 
-   * 
+   * so we will simulate a shutter.
+   *
    * @param exposureDuration ExposureDuration keyword value from the labels,
    *                         converted to seconds.
    * @param time The StartTime keyword value from the labels, converted to
diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.h b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.h
index bcbb3d7b976afbfe32024987f3f6ac9519b33c67..7eb421aafd4fa998d33fe41cef901242bd7d7fe5 100644
--- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.h
+++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.h
@@ -1,24 +1,13 @@
 #ifndef NewHorizonsLorriCamera_h
 #define NewHorizonsLorriCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -26,20 +15,20 @@
 
 namespace Isis {
   /**
-   * This is the camera model for the LORRI Framing Camera 
+   * This is the camera model for the LORRI Framing Camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup New Horizons
    *
    * @author 2013-11-12 Stuart Sides
    *
-   * @internal 
+   * @internal
    *   @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods
-   *                           to get spacecraft and instrument names. Extended unit test to test 
+   *                           to get spacecraft and instrument names. Extended unit test to test
    *                           added methods.
    *   @history 2015-08-27 Stuart Sides - Modified to work with new Lorri IK with different unit
    *                          (mm) for the focal length. Incremented camera version to 2.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    *   @history 2016-10-21 Kristin Berry - Updated unitTest. References #4476.
@@ -53,14 +42,14 @@ namespace Isis {
       //! Destroys the NewHorizonsLorriCamera object
       ~NewHorizonsLorriCamera() {};
 
-    /** 
-     * Reimplemented from FrameCamera 
-     *  
+    /**
+     * Reimplemented from FrameCamera
+     *
      * @author Stuart Sides (2013/12/26)
-     * 
+     *
      * @param time Start time of the observation
      * @param exposureDuration The exposure duration of the observation
-     * 
+     *
      * @return std::pair<iTime,iTime> The start and end times of the observation
      */
       virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
@@ -69,25 +58,25 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-98000); }
 
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.cpp b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.cpp
index 85aae25f328d3d51090d4999070e962d041673e2..b77e7cc429557940ec3d67c82ceed4345ddbe777 100644
--- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "NewHorizonsLorriDistortionMap.h"
 #include "CameraFocalPlaneMap.h"
@@ -26,15 +14,15 @@ using namespace std;
 namespace Isis {
 
   /**
-   *  
-   * Constructs a Distortion Map object for the New Horizons LORRI Camera. 
-   *  
+   *
+   * Constructs a Distortion Map object for the New Horizons LORRI Camera.
+   *
    * @param parent Pointer to parent Camera object
    * @param e2
    * @param e2
    * @param e2
    * @param zDirection passed on to the parrent
-   * 
+   *
    * @internal
    *   @history 2014-06-15 Stuart Sides - Original version
    */
@@ -50,9 +38,9 @@ namespace Isis {
   /**
    * Compute undistorted focal plane x/y
    *
-   * Compute undistorted focal plane x/y given a distorted focal plane x/y. After calling this 
-   * method, you can obtain the undistorted x/y via the UndistortedFocalPlaneX and 
-   * UndistortedFocalPlaneY methods 
+   * Compute undistorted focal plane x/y given a distorted focal plane x/y. After calling this
+   * method, you can obtain the undistorted x/y via the UndistortedFocalPlaneX and
+   * UndistortedFocalPlaneY methods
    *
    * @param dx Distorted focal plane x, in millimeters
    * @param dy Distorted focal plane y, in millimeters
@@ -81,7 +69,7 @@ namespace Isis {
     // NOTE: The discussions showed the Ky and e5 values needed to be negated. The e5 value has
     // now been negated in the LORRI IK, and the y is now negated in the equation below.
     // NOTE: The Y and Line values can not be negated in the transY and transL affines because
-    // this would cause the p_xxxxx class member variables to be in a flipped (top to bottom) 
+    // this would cause the p_xxxxx class member variables to be in a flipped (top to bottom)
     // coordinate system relative to the SPICE defined focal plane coordinate system.
     double dr = 1.0 - rr * p_e2 - y * p_e5 - x * p_e6;
 
diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.h b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.h
index ca701cbdf52920fe57716948dc18a913198e0055..7691c97f061283a6f526ffbe39908346b9077e05 100644
--- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.h
+++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.h
@@ -1,46 +1,35 @@
 #ifndef NewHorizonsLorriDistortionMap_h
 #define NewHorizonsLorriDistortionMap_h
 
-/**
- * @file
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "CameraDistortionMap.h"
 #include "Camera.h"
 
 namespace Isis {
-  /** 
-   * New Horizons LORRI Distortion Map 
-   *  
+  /**
+   * New Horizons LORRI Distortion Map
+   *
    * @author 2014-06-14 Stuart Sides
    *
-   * @internal 
+   * @internal
    *    @history 2014-06-08 Staurt Sides - Original version. Equations and coefficients
    *    taken from Jet Propulsion Laboratory Interoffice Memorandum 2011/06/08 "New Horizons
    *    LORRI Geometric Calibration of August 2006" From: W. M. Owen Jr. and D. O'Coonnell
-   *  
+   *
    *    @history 2016-02-24 Staurt Sides - New Horizons LORRI distortion model changed to
    *    subtract the distortion when going from distorted to undistorted instead of adding, and
    *    adding the distortion when going from undistorted to destorted.
    */
   class NewHorizonsLorriDistortionMap : public CameraDistortionMap {
     public:
-      NewHorizonsLorriDistortionMap(Camera *parent, double e2, double e5, double e6, 
+      NewHorizonsLorriDistortionMap(Camera *parent, double e2, double e5, double e6,
                                     double zDirection = 1.0);
       ~NewHorizonsLorriDistortionMap() {};
 
diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/unitTest.cpp b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/unitTest.cpp
index f585c2368ade5756c25f8abeab7ba61fe8f0587d..8f9fe628153bf93e6332d906c0c6149d9339dd0d 100644
--- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/unitTest.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -42,8 +31,8 @@ void TestLineSamp(Camera *cam, double samp, double line);
  * @author ????-??-?? Unknown
  *
  * @internal
- *   @history 2016-10-27 Kristin Berry -  
- */   
+ *   @history 2016-10-27 Kristin Berry -
+ */
 int main(void) {
   Preference::Preferences(true);
 
@@ -70,14 +59,14 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
     cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
     cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
@@ -102,22 +91,22 @@ int main(void) {
 
     double samp = 358.0;
     double line = 534.0;
-    double deltaT = 5000.0; 
+    double deltaT = 5000.0;
     cout << "For center pixel position ..." << endl;
 
-    cout << "Testing SetImage without deltaT..." << endl; 
+    cout << "Testing SetImage without deltaT..." << endl;
     if (!cam->SetImage(samp, line)) {
       cout << "ERROR" << endl;
       return 0;
     }
     else {
-      cout << "Sample: " << cam->Sample() << endl; 
-      cout << "Line: " << cam->Line() << endl; 
-      cout << "RightAscension: " << cam->RightAscension() << endl; 
-      cout << "Declination: " << cam->Declination() << endl; 
-      cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; 
+      cout << "Sample: " << cam->Sample() << endl;
+      cout << "Line: " << cam->Line() << endl;
+      cout << "RightAscension: " << cam->RightAscension() << endl;
+      cout << "Declination: " << cam->Declination() << endl;
+      cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl;
       cout << "PositiveEast360Longitude: " << cam->UniversalLongitude() << endl;
-      cout << "EphemerisTime: " << cam->time().Et() << endl; 
+      cout << "EphemerisTime: " << cam->time().Et() << endl;
       cout << "NorthAzimuth: " << cam->NorthAzimuth() << endl;
       cout << "SunAzimuth: " << cam->SunAzimuth() << endl;
       cout << "SpacecraftAzimuth: " << cam->SpacecraftAzimuth() << endl;
@@ -127,31 +116,31 @@ int main(void) {
 
       double pB[3];
       cam->Coordinate(pB);
-      cout << "BodyFixedCoordinate: " << pB[0] << endl; 
-      cout << "BodyFixedCoordinate: " << pB[1] << endl; 
-      cout << "BodyFixedCoordinate: " << pB[2] << endl; 
-      cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; 
-      cout << "SampleResolution: " << cam->SampleResolution() << endl; 
-      cout << "LineResolution: " << cam->LineResolution() << endl; 
-      cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; 
-      cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; 
-      cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; 
-      cout << "ObliquePixelResolution: " << cam->ObliquePixelResolution() << endl; 
+      cout << "BodyFixedCoordinate: " << pB[0] << endl;
+      cout << "BodyFixedCoordinate: " << pB[1] << endl;
+      cout << "BodyFixedCoordinate: " << pB[2] << endl;
+      cout << "LocalRadius: " << cam->LocalRadius().meters() << endl;
+      cout << "SampleResolution: " << cam->SampleResolution() << endl;
+      cout << "LineResolution: " << cam->LineResolution() << endl;
+      cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl;
+      cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl;
+      cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl;
+      cout << "ObliquePixelResolution: " << cam->ObliquePixelResolution() << endl;
     }
 
-    cout << "Testing SetImage with deltaT..." << endl; 
+    cout << "Testing SetImage with deltaT..." << endl;
     if(!cam->SetImage(samp, line, deltaT)) {
       cout << "ERROR" << endl;
       return 0;
     }
     else {
-      cout << "Sample: " << cam->Sample() << endl; 
-      cout << "Line: " << cam->Line() << endl; 
-      cout << "RightAscension: " << cam->RightAscension() << endl; 
-      cout << "Declination: " << cam->Declination() << endl; 
-      cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; 
+      cout << "Sample: " << cam->Sample() << endl;
+      cout << "Line: " << cam->Line() << endl;
+      cout << "RightAscension: " << cam->RightAscension() << endl;
+      cout << "Declination: " << cam->Declination() << endl;
+      cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl;
       cout << "PositiveEast360Longitude: " << cam->UniversalLongitude() << endl;
-      cout << "EphemerisTime: " << cam->time().Et() << endl; 
+      cout << "EphemerisTime: " << cam->time().Et() << endl;
       cout << "NorthAzimuth: " << cam->NorthAzimuth() << endl;
       cout << "SunAzimuth: " << cam->SunAzimuth() << endl;
       cout << "SpacecraftAzimuth: " << cam->SpacecraftAzimuth() << endl;
@@ -161,15 +150,15 @@ int main(void) {
 
       double pB[3];
       cam->Coordinate(pB);
-      cout << "BodyFixedCoordinate: " << pB[0] << endl; 
-      cout << "BodyFixedCoordinate: " << pB[1] << endl; 
-      cout << "BodyFixedCoordinate: " << pB[2] << endl; 
-      cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; 
-      cout << "SampleResolution: " << cam->SampleResolution() << endl; 
-      cout << "LineResolution: " << cam->LineResolution() << endl; 
-      cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; 
-      cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; 
-      cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; 
+      cout << "BodyFixedCoordinate: " << pB[0] << endl;
+      cout << "BodyFixedCoordinate: " << pB[1] << endl;
+      cout << "BodyFixedCoordinate: " << pB[2] << endl;
+      cout << "LocalRadius: " << cam->LocalRadius().meters() << endl;
+      cout << "SampleResolution: " << cam->SampleResolution() << endl;
+      cout << "LineResolution: " << cam->LineResolution() << endl;
+      cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl;
+      cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl;
+      cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl;
       cout << "ObliquePixelResolution: " << cam->ObliquePixelResolution() << endl;
     }
 
@@ -213,4 +202,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.cpp
index 16889349850f060abb9bb508e38edfddfe9d06ea..c0b2beeb856f7c30676ed1b35e25db31d176576a 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "NewHorizonsMvicFrameCamera.h"
 
@@ -39,11 +27,11 @@ using namespace std;
 namespace Isis {
 
   /**
-   * Constructs a New Horizons MVIC Framing Camera object. The MVIC push-frame camera operates 
+   * Constructs a New Horizons MVIC Framing Camera object. The MVIC push-frame camera operates
    * in "staring" mode, so it has been implemented as a framing camera rather than a push-frame.
-   * The test images show the same part of the planet in each framelet, so the push-frame 
-   * implementation will not work since the same lat/lon values are located in possibly every 
-   * framelet. 
+   * The test images show the same part of the planet in each framelet, so the push-frame
+   * implementation will not work since the same lat/lon values are located in possibly every
+   * framelet.
    *
    * @param lab Pvl label from a New Horizons MVIC Framing Camera image.
    *
@@ -55,7 +43,7 @@ namespace Isis {
     m_instrumentNameShort = "MVIC FRAMING";
     m_spacecraftNameLong = "New Horizons";
     m_spacecraftNameShort = "NewHorizons";
-    
+
     NaifStatus::CheckErrors();
 
     SetFocalLength();
@@ -66,7 +54,7 @@ namespace Isis {
     PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse);
     m_exposure = inst["ExposureDuration"];
     QString stime = inst["SpacecraftClockStartCount"];
-    // **  TODO  **  Need an offset time added to labels at ingestion??  The 0.125 value is 
+    // **  TODO  **  Need an offset time added to labels at ingestion??  The 0.125 value is
     //     the value in DELTAT00.
     double offset = 0.125;
     m_etStart = getClockTime(stime).Et() + offset;
@@ -137,7 +125,7 @@ namespace Isis {
 
     iTime time(m_utcTime[vband-1]);
     double et = time.Et();
-   
+
     SpiceChar utc[30];
     et2utc_c(et, "ISOC", 3, 30, utc);
     Camera::setTime(et);
@@ -145,7 +133,7 @@ namespace Isis {
 
     //  Set up valid band access
     Camera::SetBand(vband);
-    
+
   }
 
 
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.h b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.h
index 650a56208ab143b979f5236fd003a9800af7cacd..d6941287475a706a9f56590e08cb9d72ecd564d4 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.h
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.h
@@ -1,24 +1,13 @@
 #ifndef NewHorizonsMvicFrameCamera_h
 #define NewHorizonsMvicFrameCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
@@ -26,18 +15,18 @@
 
 namespace Isis {
   /**
-   * This is the camera model for the New Horizons MVIC Frame mode Camera 
+   * This is the camera model for the New Horizons MVIC Frame mode Camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup New Horizons
    *
    * @author 2014-03-31 Tracie Sucharski
    *
-   * @internal 
+   * @internal
    *   @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           added methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -65,31 +54,31 @@ namespace Isis {
 ////    };
 
 
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-98000); }
 
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.cpp
index a6425148f65f4fd933eec08b3df589f3276da37d..2e63fbc27e6ea558236f285fd0d85f865a989ba7 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <iostream>
 
@@ -345,7 +334,7 @@ namespace Isis {
    * @return if successful
    */
   bool NewHorizonsMvicFrameCameraDistortionMap::computeDistortionCorrections(const double xscaled,
-                                                                  const double yscaled, 
+                                                                  const double yscaled,
                                                                   double &deltax, double &deltay) {
 
     double lpx0, lpx1, lpx2, lpx3, lpx4, lpx5;
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.h b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.h
index debd942f9ad350a9e8015a3fcf14a31df5c35da9..ab3b26e1ac78d06049fe661303e03ea76c674d6b 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.h
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.h
@@ -1,24 +1,13 @@
 #ifndef NewHorizonsMvicFrameCameraDistortionMap_h
 #define NewHorizonsMvicFrameCameraDistortionMap_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 #include "CameraDistortionMap.h"
@@ -27,7 +16,7 @@ using namespace std;
 
 namespace Isis {
 
-  /** 
+  /**
    *  Distort/undistort focal plane coordinates for New Horizons/MVIC frame sensor
    *
    * Creates a map for adding/removing optical distortions
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/unitTest.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/unitTest.cpp
index 1ac1729451149b73388e72334024537903760850..886a23a7d268359c482cb619fd0e8925af662a63 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/unitTest.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -60,14 +49,14 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
     cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
     cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
@@ -149,4 +138,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.cpp
index 05af2a30089b653f5c28c3e0f82370bb42352307..29c2d6040ab30a02f2b4edfa7e50c391f19ec37f 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "NewHorizonsMvicTdiCamera.h"
 
@@ -46,7 +34,7 @@ namespace Isis {
     m_instrumentNameShort = "MVIC TDI";
     m_spacecraftNameLong = "New Horizons";
     m_spacecraftNameShort = "NewHorizons";
-    
+
     NaifStatus::CheckErrors();
 
     // Set the pixel pitch, focal length and row offset from Mvic frame transfer array
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.h b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.h
index 8de919f6e3ebcd27ce4eabb44a086a3cd92f1401..2735be183ae42cc055a12accb2b4d6687a2cd981 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.h
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.h
@@ -1,25 +1,13 @@
 #ifndef NewHorizonsMvicTdiCamera_h
 #define NewHorizonsMvicTdiCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -39,7 +27,7 @@ namespace Isis {
    *   @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           added methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    *   @history 2015-10-21 Stuart Sides - Changed the throw in the SetUndistortedFocalPlane
@@ -58,24 +46,24 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-98000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (1); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.cpp
index f549290852f9770918b895878b97f30c0d02a678..ea22e784712908bbf614cc3d8d916934d96f83fe 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.cpp
@@ -1,22 +1,11 @@
- /**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+ /** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 #include <iostream>
 
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.h b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.h
index 92040cebf660735a1c46d8e233e5bc5288122850..e29ae1168c271b49405557103cc445a91d8d46e9 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.h
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.h
@@ -1,24 +1,13 @@
 #ifndef NewHorizonsMvicTdiCameraDistortionMap_h
 #define NewHorizonsMvicTdiCameraDistortionMap_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 #include "CameraDistortionMap.h"
@@ -27,7 +16,7 @@ using namespace std;
 
 namespace Isis {
 
-  /** 
+  /**
    *  Distort/undistort focal plane coordinates for New Horizons/MVIC
    *
    * Creates a map for adding/removing optical distortions
diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/unitTest.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/unitTest.cpp
index 6db63efd2fe7087bd89a459ecd2e42b95b0863fb..01c4e99d0857dd294a6d67c1a0896a8f2c304741 100644
--- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/unitTest.cpp
+++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -45,7 +34,7 @@ void TestLineSamp(Camera *cam, double samp, double line);
  * @internal
  *   @history 2016-10-27 Kristin Berry - Added testing for new SetImage with time offset.
  *                           References #4476.
- */   
+ */
 int main(void) {
   Preference::Preferences(true);
 
@@ -70,7 +59,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
+
     // Test name methods
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
     cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
@@ -99,13 +88,13 @@ int main(void) {
       return 0;
     }
     else {
-      cout << "Sample: " << cam->Sample() << endl; 
-      cout << "Line: " << cam->Line() << endl; 
-      cout << "RightAscension: " << cam->RightAscension() << endl; 
-      cout << "Declination: " << cam->Declination() << endl; 
-      cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; 
+      cout << "Sample: " << cam->Sample() << endl;
+      cout << "Line: " << cam->Line() << endl;
+      cout << "RightAscension: " << cam->RightAscension() << endl;
+      cout << "Declination: " << cam->Declination() << endl;
+      cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl;
       cout << "PositiveEast360Longitude: " << cam->UniversalLongitude() << endl;
-      cout << "EphemerisTime: " << cam->time().Et() << endl; 
+      cout << "EphemerisTime: " << cam->time().Et() << endl;
       cout << "NorthAzimuth: " << cam->NorthAzimuth() << endl;
       cout << "SunAzimuth: " << cam->SunAzimuth() << endl;
       cout << "SpacecraftAzimuth: " << cam->SpacecraftAzimuth() << endl;
@@ -115,31 +104,31 @@ int main(void) {
 
       double pB[3];
       cam->Coordinate(pB);
-      cout << "BodyFixedCoordinate: " << pB[0] << endl; 
-      cout << "BodyFixedCoordinate: " << pB[1] << endl; 
-      cout << "BodyFixedCoordinate: " << pB[2] << endl; 
-      cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; 
-      cout << "SampleResolution: " << cam->SampleResolution() << endl; 
-      cout << "LineResolution: " << cam->LineResolution() << endl; 
-      cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; 
-      cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; 
-      cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; 
+      cout << "BodyFixedCoordinate: " << pB[0] << endl;
+      cout << "BodyFixedCoordinate: " << pB[1] << endl;
+      cout << "BodyFixedCoordinate: " << pB[2] << endl;
+      cout << "LocalRadius: " << cam->LocalRadius().meters() << endl;
+      cout << "SampleResolution: " << cam->SampleResolution() << endl;
+      cout << "LineResolution: " << cam->LineResolution() << endl;
+      cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl;
+      cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl;
+      cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl;
     }
 
     //testing SetImage with deltaT
-    double deltaT = 0.5; 
+    double deltaT = 0.5;
     if (!cam->SetImage(samp, line, deltaT)) {
       cout << "ERROR" << endl;
       return 0;
     }
     else {
-      cout << "Sample: " << cam->Sample() << endl; 
-      cout << "Line: " << cam->Line() << endl; 
-      cout << "RightAscension: " << cam->RightAscension() << endl; 
-      cout << "Declination: " << cam->Declination() << endl; 
-      cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; 
+      cout << "Sample: " << cam->Sample() << endl;
+      cout << "Line: " << cam->Line() << endl;
+      cout << "RightAscension: " << cam->RightAscension() << endl;
+      cout << "Declination: " << cam->Declination() << endl;
+      cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl;
       cout << "PositiveEast360Longitude: " << cam->UniversalLongitude() << endl;
-      cout << "EphemerisTime: " << cam->time().Et() << endl; 
+      cout << "EphemerisTime: " << cam->time().Et() << endl;
       cout << "NorthAzimuth: " << cam->NorthAzimuth() << endl;
       cout << "SunAzimuth: " << cam->SunAzimuth() << endl;
       cout << "SpacecraftAzimuth: " << cam->SpacecraftAzimuth() << endl;
@@ -149,15 +138,15 @@ int main(void) {
 
       double pB[3];
       cam->Coordinate(pB);
-      cout << "BodyFixedCoordinate: " << pB[0] << endl; 
-      cout << "BodyFixedCoordinate: " << pB[1] << endl; 
-      cout << "BodyFixedCoordinate: " << pB[2] << endl; 
-      cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; 
-      cout << "SampleResolution: " << cam->SampleResolution() << endl; 
-      cout << "LineResolution: " << cam->LineResolution() << endl; 
-      cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; 
-      cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; 
-      cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; 
+      cout << "BodyFixedCoordinate: " << pB[0] << endl;
+      cout << "BodyFixedCoordinate: " << pB[1] << endl;
+      cout << "BodyFixedCoordinate: " << pB[2] << endl;
+      cout << "LocalRadius: " << cam->LocalRadius().meters() << endl;
+      cout << "SampleResolution: " << cam->SampleResolution() << endl;
+      cout << "LineResolution: " << cam->LineResolution() << endl;
+      cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl;
+      cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl;
+      cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl;
     }
 
     if (abs(cam->UniversalLatitude() - knownLat) < 7E-12) {
@@ -199,4 +188,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/odyssey/apps/thm2isis/main.cpp b/isis/src/odyssey/apps/thm2isis/main.cpp
index 5c38f7b10a19294e0359ad176e38c5b69497a971..a38a4fa4176763c3f24dd2e7c6e3f187263f7e85 100644
--- a/isis/src/odyssey/apps/thm2isis/main.cpp
+++ b/isis/src/odyssey/apps/thm2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
@@ -227,7 +235,7 @@ void TranslateLabels(Pvl &pdsLab, Pvl &isis3, int numBands) {
   // For VIS, we have the following one to one correspondence of these keywords:
   // BandNumber   {1, 2, 3, 4, 5}
   // FilterNumber {2, 5, 3, 4, 1}
-  // 
+  //
   // Note that the BandNumber will match the OriginalBand only if the image
   // to be imported contains band number 1 and is not missing consecutive band numbers.
   bandBin += sqube.findGroup("BandBin")["BandBinBandNumber"];
diff --git a/isis/src/odyssey/apps/thmbasemap1/main.cpp b/isis/src/odyssey/apps/thmbasemap1/main.cpp
index 4a9506ee80c38c9d2e1ad71bd209c9cc2b732b10..8e8a12e8f9c72c3a7cb847c1c083669398de32bc 100644
--- a/isis/src/odyssey/apps/thmbasemap1/main.cpp
+++ b/isis/src/odyssey/apps/thmbasemap1/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "Application.h"
 #include "FileList.h"
diff --git a/isis/src/odyssey/apps/thmdriftcor/main.cpp b/isis/src/odyssey/apps/thmdriftcor/main.cpp
index 473622610a551a8fa7de067096ddb8c5a9b9e6fb..37e4707832b80f6f11449acff377419024877569 100644
--- a/isis/src/odyssey/apps/thmdriftcor/main.cpp
+++ b/isis/src/odyssey/apps/thmdriftcor/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <string>
diff --git a/isis/src/odyssey/apps/thmnoseam/main.cpp b/isis/src/odyssey/apps/thmnoseam/main.cpp
index 2ad6dd0b9c5b06ac7742fb3af0e1319677f37219..41072bef03b2de7b637743c015d237f722e35e50 100644
--- a/isis/src/odyssey/apps/thmnoseam/main.cpp
+++ b/isis/src/odyssey/apps/thmnoseam/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QString>
@@ -100,7 +108,7 @@ void IsisMain() {
     }
   }
   catch(IException &e) {
-    throw IException(e, IException::User, 
+    throw IException(e, IException::User,
                      "Unable to run thmnoseam with the given even input cube.", _FILEINFO_);
   }
 
@@ -118,7 +126,7 @@ void IsisMain() {
     }
   }
   catch(IException &e) {
-    throw IException(e, IException::User, 
+    throw IException(e, IException::User,
                      "Unable to run thmnoseam with the given odd input cube.", _FILEINFO_);
   }
 
diff --git a/isis/src/odyssey/apps/thmproc/main.cpp b/isis/src/odyssey/apps/thmproc/main.cpp
index 43058fc5d9a70afdcf2ecc6cb1431fab3a384bbe..5c34541b5f5a81efb52b32624c9794420d285a14 100644
--- a/isis/src/odyssey/apps/thmproc/main.cpp
+++ b/isis/src/odyssey/apps/thmproc/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "Pipeline.h"
 
@@ -21,7 +29,7 @@ void IsisMain() {
       throw IException(IException::User, msg, _FILEINFO_);
     }
   }
-  
+
   if(ui.WasEntered("CK")) {
     FileName ckPreference = ui.GetFileName("CK");
     if(!ckPreference.fileExists()){
@@ -29,7 +37,7 @@ void IsisMain() {
       throw IException(IException::User, msg, _FILEINFO_);
     }
   }
-  
+
   if(ui.WasEntered("SPK")) {
     FileName spkPreference = ui.GetFileName("SPK");
     if(!spkPreference.fileExists()){
@@ -54,7 +62,7 @@ void IsisMain() {
   if(ui.GetBoolean("INGESTION")) {
     Pvl labels(ui.GetFileName("FROM"));
 
-    if((QString)labels["DETECTOR_ID"][0] == "VIS") { 
+    if((QString)labels["DETECTOR_ID"][0] == "VIS") {
       if(((QString)labels["DATA_SET_ID"]).contains("RDR")) {
         ProcessVis(true);
       }
diff --git a/isis/src/odyssey/apps/thmvisflat/main.cpp b/isis/src/odyssey/apps/thmvisflat/main.cpp
index d2a3da5ebe3eedbcaf6aa3a2c019c181856b27cb..e68d7b6c4e23f0337481ad93dc757502fe83f1c8 100644
--- a/isis/src/odyssey/apps/thmvisflat/main.cpp
+++ b/isis/src/odyssey/apps/thmvisflat/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "Blob.h"
 #include "Cube.h"
@@ -20,7 +28,7 @@ void IsisMain() {
   }
 
   icube.open(FileName(ui.GetFileName("FROM")).expanded());
-  
+
   // Make sure it is a Themis EDR/RDR
   FileName inFileName = ui.GetFileName("FROM");
   try {
@@ -35,7 +43,7 @@ void IsisMain() {
     msg += inFileName.expanded() + "] does not appear to be a THEMIS VIS image.";
     throw IException(e, IException::User, msg, _FILEINFO_);
   }
-  
+
   vector<Cube *> flatcubes;
   vector<LineManager *> fcubeMgrs;
   int summing = toInt(icube.group("Instrument")["SpatialSumming"][0]);
@@ -146,4 +154,3 @@ void IsisMain() {
   fcubeMgrs.clear();
   flatcubes.clear();
 }
-
diff --git a/isis/src/odyssey/apps/thmvistrim/main.cpp b/isis/src/odyssey/apps/thmvistrim/main.cpp
index 30559231c0fbd991e4ad7df10c0e4100c3efa27e..68ad45d9fd912b2f793acc3b6d677757d497b59e 100644
--- a/isis/src/odyssey/apps/thmvistrim/main.cpp
+++ b/isis/src/odyssey/apps/thmvistrim/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <string>
@@ -36,7 +44,7 @@ void IsisMain() {
     }
   }
   catch(IException &e) {
-    throw IException(e, IException::User, 
+    throw IException(e, IException::User,
                      "Unable to run thmvistrim with the given input cube.", _FILEINFO_);
   }
 
diff --git a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.cpp b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.cpp
index 166b32b57b0fade05f9fd80e8dbcc8e06dce92cf..9ce6b033cddc2013e3aa0cf6a1a9c068a2f9890b 100644
--- a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.cpp
+++ b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "ThemisIrCamera.h"
 #include "ThemisIrDistortionMap.h"
@@ -46,7 +34,7 @@ namespace Isis {
     m_instrumentNameShort = "Themis-IR";
     m_spacecraftNameLong = "Mars Odyssey";
     m_spacecraftNameShort = "Odyssey";
-    
+
     NaifStatus::CheckErrors();
     // Set the detector size
     SetPixelPitch(0.05);
diff --git a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.h b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.h
index c63703bbb83db6a0da09879c41e80f7621936491..12bdddf9e336370d89e451e8c653ec41f8b18bff 100644
--- a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.h
+++ b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.h
@@ -1,25 +1,13 @@
 #ifndef ThemisIrCamera_h
 #define ThemisIrCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "LineScanCamera.h"
 
@@ -31,8 +19,8 @@ namespace Isis {
   /**
    * @brief THEMIS IR Camera
    *
-   * This is the camera model for the Thermal Emission Imaging System 
-   * Infrared (THEMIS IR) camera 
+   * This is the camera model for the Thermal Emission Imaging System
+   * Infrared (THEMIS IR) camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup MarsOdyssey
@@ -54,12 +42,12 @@ namespace Isis {
    *                           Updated documentation. Removed Odyssey namespace
    *                           wrap inside Isis namespace. Added Isis Disclaimer
    *                           to files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -79,24 +67,24 @@ namespace Isis {
 
       /**
        * CK frame ID -  - Instrument Code from spacit run on CK
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return (-53000); }
 
-      /** 
+      /**
        * CK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (16); }
 
-      /** 
+      /**
        *  SPK Reference ID - J2000
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
       virtual int SpkReferenceId() const { return (1); }
@@ -108,6 +96,6 @@ namespace Isis {
       QString p_tdiMode;
       std::vector<int> p_originalBand;
   };
-  
+
 };
 #endif
diff --git a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.cpp b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.cpp
index 302f172c77e1e826bc76c3858f0e46a132e5a07e..bae8484ca13f7d372e544655780cbee2a372cd52 100644
--- a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.cpp
+++ b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <cmath>
 #include "ThemisIrDistortionMap.h"
@@ -78,4 +66,3 @@ namespace Isis {
     return true;
   }
 }
-
diff --git a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.h b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.h
index 29933209fa67d5539f2b4b68b69197567348f75c..6ac2fe37283f9c5a7720304164f8804938886f3e 100644
--- a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.h
+++ b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.h
@@ -1,25 +1,13 @@
 #ifndef ThemisIrDistortionMap_h
 #define ThemisIrDistortionMap_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "CameraDistortionMap.h"
 
@@ -33,12 +21,12 @@ namespace Isis {
    * @ingroup MarsOdyssey
    *
    * @see ThemisIrCamera
-   *  
-   *  @author 2005-02-01 Jeff Anderson 
-   *  
+   *
+   *  @author 2005-02-01 Jeff Anderson
+   *
    *  @internal
    *   @history 2005-02-01 Jeff Anderson - Original version
-   *   @history 2009-03-27 Jeff Anderson - Modified to use Duxbury's distortion 
+   *   @history 2009-03-27 Jeff Anderson - Modified to use Duxbury's distortion
    *                         model from Feb 2009 email with attached PDF
    *                         document
    *   @history 2011-05-03 Jeannie Walldren - Removed Odyssey namespace wrap.
diff --git a/isis/src/odyssey/objs/ThemisIrCamera/unitTest.cpp b/isis/src/odyssey/objs/ThemisIrCamera/unitTest.cpp
index 0d8603accc86419d7951966a71d071f1ecd1ef32..e9a0abf4ed6ac53a5bddc2c107651c5f3f0637d0 100644
--- a/isis/src/odyssey/objs/ThemisIrCamera/unitTest.cpp
+++ b/isis/src/odyssey/objs/ThemisIrCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -60,7 +49,7 @@ int main(void) {
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-      
+
     // Test all four corners to make sure the conversions are right
     cout << "For upper left corner ..." << endl;
     TestLineSamp(cam, 1.0, 1.0);
@@ -96,7 +85,7 @@ int main(void) {
     else {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
     }
-    
+
     // Test name methods
     cout << endl << endl << "Testing name methods ..." << endl;
     cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
@@ -129,4 +118,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.cpp b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.cpp
index 0a77b5c574266adb9af137d03cd0e0231c48f2a2..d3ec4b85081a7a7bb6611c374f3f701e05fbdbf7 100644
--- a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.cpp
+++ b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ThemisVisCamera.h"
 
 #include <iomanip>
@@ -52,7 +41,7 @@ namespace Isis {
     m_instrumentNameShort = "Themis-VIS";
     m_spacecraftNameLong = "Mars Odyssey";
     m_spacecraftNameShort = "Odyssey";
-    
+
     NaifStatus::CheckErrors();
     // Set up the camera characteristics
     // LoadFrameMounting("M01_SPACECRAFT","M01_THEMIS_VIS");
@@ -122,7 +111,7 @@ namespace Isis {
     LoadCache();
     NaifStatus::CheckErrors();
   }
-  
+
 
   ThemisVisCamera::~ThemisVisCamera() {
   }
@@ -170,16 +159,16 @@ namespace Isis {
       int wavelengthToTimeBand[] = { 2, 5, 3, 4, 1 };
       timeBand = wavelengthToTimeBand[ReferenceBand() - 1];
     }
-    
+
     // Compute the time offset for this detector line.
     // Subtract 1 from the time band then multiply by the interframe delay then
     // subtract half the exposure duration, in seconds.
-    // 
+    //
     // Subtracting 1 from the time band number calculates the appropriate
     // number of interframe delay multiples for this filter number (recall this
     // corresponds to a location on the ccd)
     p_bandTimeOffset = ((timeBand - 1) * p_interframeDelay) - ((p_exposureDur / 1000.0) / 2.0);
-    
+
     // Set the detector first line for this band on the ccd.
     // The VIS band first row values are 1-based detector row numbers
     // used for the beginning (bottom) of the 192-row framelet for the various bands.
@@ -197,7 +186,7 @@ namespace Isis {
 
   /**
    * The camera model is band dependent (i.e. not band independent), so this
-   * method returns false 
+   * method returns false
    *
    * @return @b bool This will always return False.
    */
@@ -209,8 +198,8 @@ namespace Isis {
 
   /**
    * CK frame ID -  - Instrument Code from spacit run on CK
-   *  
-   * @return @b int The appropriate instrument code for the "Camera-matrix" 
+   *
+   * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Frame ID
    */
   int ThemisVisCamera::CkFrameId() const {
@@ -219,9 +208,9 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    * CK Reference ID - MARSIAU
-   * 
+   *
    * @return @b int The appropriate instrument code for the "Camera-matrix"
    *         Kernel Reference ID
    */
@@ -231,9 +220,9 @@ namespace Isis {
 
 
 
-  /** 
+  /**
    * SPK Reference ID - J2000
-   * 
+   *
    * @return @b int The appropriate instrument code for the Spacecraft
    *         Kernel Reference ID
    */
diff --git a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.h b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.h
index 8d04b8b826aadb001562b76099b257f612adfd59..ec6bc8fa63d7fe512267ba5bfe4ad0efcbaaef03 100644
--- a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.h
+++ b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.h
@@ -1,25 +1,13 @@
 #ifndef ThemisVisCamera_h
 #define ThemisVisCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "PushFrameCamera.h"
 
@@ -27,8 +15,8 @@ namespace Isis {
   /**
    * @brief THEMIS VIS Camera Model
    *
-   * This is the camera model for the Thermal Emission Imaging System 
-   * Visible-Imaging Subsystem (THEMIS VIS) Push Frame camera 
+   * This is the camera model for the Thermal Emission Imaging System
+   * Visible-Imaging Subsystem (THEMIS VIS) Push Frame camera
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup MarsOdyssey
@@ -46,17 +34,17 @@ namespace Isis {
    *   @history 2010-08-04 Jeannie Backer - Removed Isis namespace wrap around Odyssey namespace
    *                           and replaced with "using namespace Isis". Added NAIF error check to
    *                           constructor.
-   *   @history 2010-09-14 Steven Lambright - Updated unitTest to not use a DEM. 
+   *   @history 2010-09-14 Steven Lambright - Updated unitTest to not use a DEM.
    *   @history 2011-01-14 Travis Addair - Added new CK/SPK accessor methods, pure virtual in
    *                           Camera, implemented in mission specific cameras.
-   *   @history 2011-02-09 Steven Lambright - Major changes to camera classes. 
+   *   @history 2011-02-09 Steven Lambright - Major changes to camera classes.
    *   @history 2011-02-23 Mackenzie Boyd -   Modified focal length from 203.9 to 202.059 per
    *                           request from Christopher Edwards at ASU,
    *                           (Christopher.Edwards@asu.edu). Updated unitTest.
    *   @history 2011-05-03 Jeannie Backer - Fixed documentation.  Replaced Odyssey namespace wrap
-   *                           with Isis namespace wrap. Added Isis Disclaimer to files. Updated 
+   *                           with Isis namespace wrap. Added Isis Disclaimer to files. Updated
    *                           unitTest to test for new methods.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2014-08-22 Jeannie Backer - Fixed bug in camera model to used the FilterNumber
    *                           rather than the OriginalBand to determine the appropriate filter
@@ -68,13 +56,13 @@ namespace Isis {
    *   @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to
    *                           test these methods.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
-   *  
-   *  
-   *  
-   *  
+   *
+   *
+   *
+   *
    *   @todo 2014-08-22 Jeannie Backer - THEMIS cameras do not appear to import a ReferenceBand
    *                        keyword neither in the thm2isis source code nor in its translation
    *                        tables. In this camera model, BandEphemerisTimeOffset() does a check
@@ -106,12 +94,11 @@ namespace Isis {
       double p_exposureDur;       //!< Exposure Duration value from labels
       double p_interframeDelay;   //!< Interframe Delay value from labels
       int p_nframes;              //!< Number of frames in whole image
-      QList<int> p_filterNumber;  /**< List of filter number values from the Instrument BandBin 
-                                       group that correspond to each band in the cube. Filter 
-                                       numbers indicate the physical location of the band in the 
+      QList<int> p_filterNumber;  /**< List of filter number values from the Instrument BandBin
+                                       group that correspond to each band in the cube. Filter
+                                       numbers indicate the physical location of the band in the
                                        detector array.  They are numbered by ascending times.*/
   };
 };
 
 #endif
-
diff --git a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.cpp b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.cpp
index 9293f50eae2be396bb76505a78331a5d8efabf00..ba162cad9ba7cbd0ff5b2acdfd09b6d5e34abe3e 100644
--- a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.cpp
+++ b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.cpp
@@ -1,21 +1,10 @@
-/**
- * @file 
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QDebug>
 #include "ThemisVisDistortionMap.h"
@@ -27,9 +16,9 @@ namespace Isis {
   /**
    * Constructs a Distortion Map for the Themis Vis Camera
    *
-   * @param parent Pointer to the parent Camera object 
-   * 
-   * @internal 
+   * @param parent Pointer to the parent Camera object
+   *
+   * @internal
    *   @history 2011-05-03 Jeannie Walldren - Added NAIF error check.  Fixed
    *                          documentation.
    */
@@ -37,7 +26,7 @@ namespace Isis {
     CameraDistortionMap(parent, 1.0) {
     // Set necessary constant values
 
-    // The IR pixel pitch is used by VIS processing because optical distortion corrections are in 
+    // The IR pixel pitch is used by VIS processing because optical distortion corrections are in
     // terms of IR pixels. Note that the pixel pitch for the instrument currently being processed
     // is stored in ISIS2's ccd.mmpp.
     // from IR_PIXEL_PITCH in ISIS2's thm_parameters.def.N
@@ -129,7 +118,7 @@ namespace Isis {
     // between the boresight and the look vector for a given detector sample/line coordinate,
     // these factors are used to compute a detector sample coordinate that will give a look
     // vector corresponding to where the given look vector (detector sample/line) is
-    // really looking on the planet 
+    // really looking on the planet
     // (values read from VIS_OD_CX and VIS_OD_CY[N] in thm_parameters.def.7.2, last updated 03/2003)
     double vis_od_cx[] = { -4.02919e-5, 0.0, 0.0 }; // VIS optical distortion coefficients for x
     double vis_od_cy[] = { -0.0178649, -0.00727843, 5.65278e-5 };
@@ -139,9 +128,9 @@ namespace Isis {
     // compute IR pixels(lines) relative to boresight
     double j = p_undistortedFocalPlaneY / p_irPixelPitch;
 
-    // IR distortion in Y (pixels) 
+    // IR distortion in Y (pixels)
     // Note that (-j) is used here because the orientation of positive displacement from the boresight in the Y
-    // direction assumed for the correction parameters is opposite of the positive direction for j. 
+    // direction assumed for the correction parameters is opposite of the positive direction for j.
     double deltaj = vis_od_cy[0] + ( vis_od_cy[1] * (-j)) + ( vis_od_cy[2] * (-j) * (-j));
 
     // IR stretch factor in X direction
@@ -188,24 +177,24 @@ namespace Isis {
     double ux_guess, uy_guess;
 
     // "solve" undistorted focal plane equations for ux and uy to get beginning offset
-    double xOffset  = -dy / p_irPixelPitch * vis_od_cx[0] 
-                      + vis_od_cx[0] * p_irBoreLine 
+    double xOffset  = -dy / p_irPixelPitch * vis_od_cx[0]
+                      + vis_od_cx[0] * p_irBoreLine
                       - vis_od_cx[0] * p_ir_b5_effectiveDetectorLine;
-    double yOffset  =  p_irPixelPitch * vis_od_cy[0] / dy 
-                      - vis_od_cy[1] 
+    double yOffset  =  p_irPixelPitch * vis_od_cy[0] / dy
+                      - vis_od_cy[1]
                       + dy / p_irPixelPitch * vis_od_cy[2];
-    
+
     while (!done) {
     // In this loop, we will use the current offset to make a guess at the
     // undistorted focal plane coordinate that corresponds to the known
     // distorted focal plane coordinate.
-    // 
+    //
     // The offset is updated using the undistored guess.
-    // 
+    //
     // Each undistorted guess will be tested by reversing the equation used to
     // compute the current undistorted guess to get a corresponding distorted
     // coordinate.
-    // 
+    //
     // If this distorted coordinate that corresponds to the current undistorted
     // guess is close enough to the known distorted coordinate, then we will
     // accept the corresponding undistorted coordinate as our solution and end
@@ -215,11 +204,11 @@ namespace Isis {
       uy_guess = dy / (1.0 + yOffset);
 
       // offset is updated with each undistored x and y guess
-      xOffset = -uy_guess / p_irPixelPitch * vis_od_cx[0] 
-                + vis_od_cx[0] * p_irBoreLine 
+      xOffset = -uy_guess / p_irPixelPitch * vis_od_cx[0]
+                + vis_od_cx[0] * p_irBoreLine
                 - vis_od_cx[0] * p_ir_b5_effectiveDetectorLine;
-      yOffset =  p_irPixelPitch * vis_od_cy[0] / uy_guess 
-                - vis_od_cy[1] 
+      yOffset =  p_irPixelPitch * vis_od_cy[0] / uy_guess
+                - vis_od_cy[1]
                 + uy_guess / p_irPixelPitch * vis_od_cy[2];
 
       // find the distorted x/y corresponding to the undistorted x/y guess
@@ -238,7 +227,7 @@ namespace Isis {
         return false;
       }
     }
-    
+
     // use the undistorted x/y whose corresponding distorted x/y are both close enough to the known
     // distorted x/y
     p_undistortedFocalPlaneX = ux_guess;
diff --git a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.h b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.h
index 4a08ac475e83a7dc1b1c444d7f78c58690aa6439..6affec84acf7543f1fc75a7e2239a5cd891f50bb 100644
--- a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.h
+++ b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.h
@@ -1,24 +1,14 @@
 #ifndef ThemisVisDistortionMap_h
 #define ThemisVisDistortionMap_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CameraDistortionMap.h"
 
 namespace Isis {
@@ -31,11 +21,11 @@ namespace Isis {
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup MarsOdyssey
    *
-   * @see ThemisVisCamera 
-   *  
+   * @see ThemisVisCamera
+   *
    * @author 2006-01-03 Elizabeth Miller
    *
-   * @internal 
+   * @internal
    *   @history 2011-05-03 Jeannie Walldren - Fixed documentation.  Removed
    *                          Odyssey namespace wrap inside Isis wrap.
    *   @history 2014-04-17 Jeannie Backer - Updated documentation for forward/reverse directions
@@ -53,10 +43,10 @@ namespace Isis {
       virtual bool SetUndistortedFocalPlane(const double ux, const double uy);
 
     private:
-      double p_irPixelPitch;    //!< Pixel Pitch for Themis Ir Camera (in meters per pixel).  
+      double p_irPixelPitch;    //!< Pixel Pitch for Themis Ir Camera (in meters per pixel).
       double p_visPixelPitch;   //!< Pixel Pitch for Themis Vis Camera (in meters per pixel).
 
-      double p_ir_b5_effectiveDetectorLine; /**< Effective 1-based detector line number used for 
+      double p_ir_b5_effectiveDetectorLine; /**< Effective 1-based detector line number used for
                                                  observing the Band 5, i.e., average of the 16
                                                  detector lines used for the band. Detector line
                                                  numbers increase upwards in the image. */
diff --git a/isis/src/odyssey/objs/ThemisVisCamera/unitTest.cpp b/isis/src/odyssey/objs/ThemisVisCamera/unitTest.cpp
index 8bc4c7f6ff5ee718ddede55d4d655ee1025c3501..81f98b3c7ac57c572542c0bf1fbb362cdd83ce73 100644
--- a/isis/src/odyssey/objs/ThemisVisCamera/unitTest.cpp
+++ b/isis/src/odyssey/objs/ThemisVisCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 
 #include <iomanip>
@@ -47,7 +36,7 @@ int main(void) {
     // These should be lat/lon at center of image. To obtain these numbers for a new cube/camera,
     // set both the known lat and known lon to zero and copy the unit test output "Latitude off by: "
     // and "Longitude off by: " values directly into these variables.
-    //double knownCenterLat =  48.53477763371114; 
+    //double knownCenterLat =  48.53477763371114;
     //double knownCenterLon = 332.0435632412456;
     // double knownCenterLat = 48.5338707313522;
     // double knownCenterLon = 332.0434591311045;
@@ -84,7 +73,7 @@ int main(void) {
 
     qDebug() << "For lower right corner ...";
     TestSampLine(evenCam, evenCam->Samples(), evenCam->Lines());
-    
+
     qDebug() << "For center framelet 14 pixel position ...";
     double samp = evenCam->Samples() / 2;
     double line = evenCam->Lines() / 2 + 192.0 /2.0 / 2.0; // add half of summed framelet to get
@@ -99,7 +88,7 @@ int main(void) {
       qDebug() << "Latitude:     OK";
     }
     else {
-      qDebug() << "Latitude:     off by " 
+      qDebug() << "Latitude:     off by "
                << QString::number(evenCam->UniversalLatitude() - knownCenterLat,  'f',  16);
     }
 
@@ -107,7 +96,7 @@ int main(void) {
       qDebug() << "Longitude:    OK";
     }
     else {
-      qDebug() << "Longitude:    off by " 
+      qDebug() << "Longitude:    off by "
                << QString::number(evenCam->UniversalLongitude() - knownCenterLon,  'f',  16);
     }
     TestSampLine(evenCam, samp, line);
@@ -141,7 +130,7 @@ int main(void) {
 
     qDebug()<< "For lower right corner ...";
     TestSampLine(oddCam, oddCam->Samples(), oddCam->Lines() - 96.0); // omit framelet 26 for odd
-    
+
     qDebug() << "For center framelet 13 pixel position ...";
     knownCenterLat =  48.563958771636;
     knownCenterLon = 332.04676929446;
@@ -171,7 +160,7 @@ int main(void) {
     TestSampLine(oddCam, samp, line);
 
     qDebug() << "";
-    
+
     // Test name methods
     qDebug() << "Testing name methods ...";
     qDebug() << "Spacecraft Name Long: " << evenCam->spacecraftNameLong();
@@ -180,12 +169,12 @@ int main(void) {
     qDebug() << "Instrument Name Short: " << evenCam->instrumentNameShort();
     qDebug() << "";
     qDebug() << "";
-    
+
     qDebug() << "Testing errors";
     try {
       Cube irCube("$ISISTESTDATA/isis/src/odyssey/unitTestData/I00831002RDR.cub", "r");
       ThemisVisCamera irImage(irCube);
-    } 
+    }
     catch (IException &e) {
       e.print();
     }
@@ -229,4 +218,3 @@ void TestSampLine(Camera *cam, double samp, double line) {
 
   qDebug() << "";
 }
-
diff --git a/isis/src/osirisrex/apps/ocams2isis/main.cpp b/isis/src/osirisrex/apps/ocams2isis/main.cpp
index 2c3c2413aae5f5c235a65c4ee5cd78fcfaa9896d..bcb5f31fefe6a06b2e78fd6fc979d1dee03afd19 100644
--- a/isis/src/osirisrex/apps/ocams2isis/main.cpp
+++ b/isis/src/osirisrex/apps/ocams2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <fstream>
diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.cpp b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.cpp
index 5bbaaef4723ea392f53441271ac2fc4075ae38e6..8a5ec8e9c82ed8cfafe5fbac303c806ff1cc3074 100644
--- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.cpp
+++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.cpp
@@ -1,25 +1,10 @@
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2008/02/21 16:04:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QDebug>
 #include <QtGlobal>
@@ -30,22 +15,22 @@
 #include "CameraFocalPlaneMap.h"
 
 namespace Isis {
-  /** 
+  /**
    * OSIRIS REx Camera distortion map constructor
    *
-   * Create a camera distortion map for OSIRIS REx's. 
-   *  
-   * This class maps between distorted and undistorted 
-   * focal plane x/y's. The default mapping is the identity, that is, 
-   * the focal plane x/y and undistorted focal plane x/y will be 
-   * identical. 
+   * Create a camera distortion map for OSIRIS REx's.
+   *
+   * This class maps between distorted and undistorted
+   * focal plane x/y's. The default mapping is the identity, that is,
+   * the focal plane x/y and undistorted focal plane x/y will be
+   * identical.
    *
    * @param parent        the parent camera that will use this distortion map
    * @param zDirection    the direction of the focal plane Z-axis
    *                      (either 1 or -1)
    *
    */
-  OsirisRexDistortionMap::OsirisRexDistortionMap(Camera *parent, double zDirection) 
+  OsirisRexDistortionMap::OsirisRexDistortionMap(Camera *parent, double zDirection)
       : CameraDistortionMap(parent, zDirection) {
 
     m_detectorOriginSample = p_camera->FocalPlaneMap()->DetectorSampleOrigin();
@@ -61,7 +46,7 @@ namespace Isis {
    }
 
 
-  /** 
+  /**
    *  Load distortion coefficients and center-of-distortion for OCAMS
    *
    * This method loads the distortion coefficients from the instrument
@@ -72,15 +57,15 @@ namespace Isis {
    * INS-64361_OD_K_FILTER = (2.21E-05, 1.71E-04, 5.96E-05, 0.00E+00, 0.00E+00)
    * INS-64361_OD_CENTER_FILTER = (486.2, 450.3)
    * @endcode
-   *  
+   *
    * Or if the distortion is not filter-dependent:
-   *  
+   *
    * @code
    * INS-64361_OD_K = (2.21E-05, 1.71E-04, 5.96E-05, 0.00E+00, 0.00E+00)
    * INS-64361_OD_CENTER = (486.2, 450.3)
    * @endcode
-   *  
-   *  
+   *
+   *
    * @param naifIkCode    Code to search for in instrument kernel
    */
   void OsirisRexDistortionMap::SetDistortion(int naifIkCode, QString filter="UNKNOWN") {
@@ -98,29 +83,29 @@ namespace Isis {
       for (int i = 0; i < 5; ++i) {
          p_odk.push_back(p_camera->Spice::getDouble(odkkey, i));
       }
-    } 
+    }
     catch (IException &e) {
       // This means that this is an older image without a filter provided
-      // don't update p_odk, we will not apply the distortion in this case 
+      // don't update p_odk, we will not apply the distortion in this case
       m_distortionOriginSample = -1;
       m_distortionOriginLine = -1;
       return;
     }
 
     // Load center-of-distortion coordinates, including filter if we have it
-    QString odcenterkey; 
+    QString odcenterkey;
     if (filter.toUpper().compare("UNKNOWN") == 0) {
       odcenterkey = "INS" + toString(naifIkCode) + "_OD_CENTER";
     }
     else {
-      odcenterkey = "INS" + toString(naifIkCode) + "_OD_CENTER_" + filter.trimmed().toUpper(); 
+      odcenterkey = "INS" + toString(naifIkCode) + "_OD_CENTER_" + filter.trimmed().toUpper();
     }
     m_distortionOriginSample = p_camera->Spice::getDouble(odcenterkey, 0);
     m_distortionOriginLine =   p_camera->Spice::getDouble(odcenterkey, 1);
   }
 
 
-  /** 
+  /**
    * Compute undistorted focal plane x/y
    *
    * Compute undistorted focal plane x/y given a distorted focal plane x/y.
@@ -133,17 +118,17 @@ namespace Isis {
    * @return if the conversion was successful
    */
   bool OsirisRexDistortionMap::SetFocalPlane(double dx, double dy) {
-    p_focalPlaneX = dx; 
+    p_focalPlaneX = dx;
     p_focalPlaneY = dy;
 
     // Only apply the distortion if we have the correct number of coefficients
     if (p_odk.size() < 2) {
       p_undistortedFocalPlaneX = dx;
       p_undistortedFocalPlaneY = dy;
-      return true; 
+      return true;
     }
 
-    double x0 = (m_distortionOriginLine - m_detectorOriginSample) * m_pixelPitch; 
+    double x0 = (m_distortionOriginLine - m_detectorOriginSample) * m_pixelPitch;
     double y0 = (m_distortionOriginSample - m_detectorOriginLine) * m_pixelPitch;
 
     double xt = dx;
@@ -169,7 +154,7 @@ namespace Isis {
       xx = (xt-x0) * (xt-x0);
       yy = (yt-y0) * (yt-y0);
       rr = xx + yy;
-      r = qSqrt(rr); 
+      r = qSqrt(rr);
       rrr = rr * r;
       rrrr = rr * rr;
 
@@ -204,11 +189,11 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    * Compute distorted focal plane x/y
    *
    * Compute distorted focal plane x/y given an undistorted focal plane x/y.
-   *  
+   *
    * After calling this method, you can obtain the distorted x/y via the
    * FocalPlaneX and FocalPlaneY methods
    *
@@ -227,7 +212,7 @@ namespace Isis {
     if (p_odk.size() < 2) {
       p_focalPlaneX = ux;
       p_focalPlaneY = uy;
-      return true; 
+      return true;
     }
     double x0 = (m_distortionOriginLine - m_detectorOriginSample) * m_pixelPitch;
     double y0 = (m_distortionOriginSample - m_detectorOriginLine) * m_pixelPitch;
@@ -251,8 +236,7 @@ namespace Isis {
     double drOverR = p_odk[0] + p_odk[1]*r + p_odk[2]*r2 + p_odk[3]*r3 + p_odk[4]*r4;
 
     p_focalPlaneX = x + drOverR * (x-x0);
-    p_focalPlaneY = y + drOverR * (y-y0); 
+    p_focalPlaneY = y + drOverR * (y-y0);
     return true;
   }
 }
-
diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.h b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.h
index c8bdc0a1a168e51839b0e828338eaddaa7807cfd..613db94d8cb987be280cc3a29f708c8adfe3a82b 100644
--- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.h
+++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.h
@@ -1,28 +1,14 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/02/21 16:04:33 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
 #ifndef OsirisRexDistortionMap_h
 #define OsirisRexDistortionMap_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CameraDistortionMap.h"
 
 namespace Isis {
@@ -53,12 +39,12 @@ namespace Isis {
 
       virtual bool SetUndistortedFocalPlane(double ux, double uy);
 
-    protected: 
+    protected:
       double m_pixelPitch; //!< The pixel pitch for OCAMS.
       double m_detectorOriginSample; //!< The origin of the detector's sample coordinate.
       double m_detectorOriginLine; //!< The origin of the detector's line coordinate.
       double m_distortionOriginSample; //!< The distortion's origin sample coordinate.
-      double m_distortionOriginLine; //!< The distortion's origin line coordinate. 
+      double m_distortionOriginLine; //!< The distortion's origin line coordinate.
   };
 };
 #endif
diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.cpp b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.cpp
index 9e0c8001c8745027e6ee66b72e706679ac652928..cbfdd2c622b0606f8f9c530aa8e961701ca85957 100644
--- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.cpp
+++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "OsirisRexOcamsCamera.h"
 
diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.h b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.h
index d006ab193ff8007857ee38cca90c5b235e5cb467..0176134edc1ceb3ee4fc91b68096fd2b5008ee7b 100644
--- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.h
+++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.h
@@ -1,24 +1,13 @@
 #ifndef OsirisRexOcamsCamera_h
 #define OsirisRexOcamsCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FramingCamera.h"
 
diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp
index 04ef4a3fe918e486dc873e8f5e9fa94848e7d4c9..9eac67829679469092f2413aa1a1715ee3dcb3a9 100644
--- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp
+++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -192,4 +181,3 @@ void testLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = NO INTERSECTION" << endl << endl;
   }
 }
-
diff --git a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp
index fec92f568ae097d3e29370d8440f9c062bca39b9..0c1d478f0158d3f7cfed8f465a67c2a03edc2aa1 100644
--- a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp
+++ b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "CnetEditorWindow.h"
diff --git a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.h b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.h
index dbd97a5e27cbdd5edbb20c7ac93486da2b25d9d3..05c8fbbdf31915b1681a0fdb60b8c8503905fd01 100644
--- a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.h
+++ b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.h
@@ -1,6 +1,14 @@
 #ifndef CnetEditorWindow_H
 #define CnetEditorWindow_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QFileDialog>
 #include <QMainWindow>
 #include <qaction.h>
diff --git a/isis/src/qisis/apps/cneteditor/main.cpp b/isis/src/qisis/apps/cneteditor/main.cpp
index 66ec01dbfbc1b5e41ab41af30b2e4638734df3c3..ce2e3fc1e6edfba2a47b92457bdd069091a48f33 100644
--- a/isis/src/qisis/apps/cneteditor/main.cpp
+++ b/isis/src/qisis/apps/cneteditor/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include <iostream>
@@ -19,4 +27,3 @@ int main(int argc, char ** argv)
 
   app.exec();
 }
-
diff --git a/isis/src/qisis/apps/ipce/IpceMainWindow.cpp b/isis/src/qisis/apps/ipce/IpceMainWindow.cpp
index c4ad55b7c44147712180fab895f70730a3adc82f..cf1016d1d0c70c67133e1b09f23660668e09b56d 100644
--- a/isis/src/qisis/apps/ipce/IpceMainWindow.cpp
+++ b/isis/src/qisis/apps/ipce/IpceMainWindow.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IpceMainWindow.h"
 
 #include <QApplication>
@@ -188,7 +174,7 @@ namespace Isis {
       workorder->execute();
     }
   }
-  
+
 
   /**
    * This is connected from Directory's newWidgetAvailable signal
diff --git a/isis/src/qisis/apps/ipce/IpceMainWindow.h b/isis/src/qisis/apps/ipce/IpceMainWindow.h
index 4b74341aafaa293454e4cd1a3bfe1c1da9bb006b..48b953ff306dc9928445c30074c15b9defb5608a 100644
--- a/isis/src/qisis/apps/ipce/IpceMainWindow.h
+++ b/isis/src/qisis/apps/ipce/IpceMainWindow.h
@@ -1,27 +1,13 @@
 #ifndef IpceMainWindow_H
 #define IpceMainWindow_H
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "ViewSubWindow.h"
 #include <QEvent>
diff --git a/isis/src/qisis/apps/ipce/ProgressWidget.cpp b/isis/src/qisis/apps/ipce/ProgressWidget.cpp
index 08c264ae23ee04cad1c597f0914d504286f0cfe8..d9e8b74c976923afb9a05d54b401538636deebd4 100644
--- a/isis/src/qisis/apps/ipce/ProgressWidget.cpp
+++ b/isis/src/qisis/apps/ipce/ProgressWidget.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ProgressWidget.h"
 
 #include <QtDebug>
diff --git a/isis/src/qisis/apps/ipce/ProgressWidget.h b/isis/src/qisis/apps/ipce/ProgressWidget.h
index 0e1ade1528f1ff2fa1c45b07a4bccaf00669a3bc..bc758f4f5a95ae7b3b11322be13ecec01fd94074 100644
--- a/isis/src/qisis/apps/ipce/ProgressWidget.h
+++ b/isis/src/qisis/apps/ipce/ProgressWidget.h
@@ -1,6 +1,14 @@
 #ifndef ProgressWidget_H
 #define ProgressWidget_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QProgressBar>
 
 namespace Isis {
@@ -26,4 +34,3 @@ namespace Isis {
 }
 
 #endif
-
diff --git a/isis/src/qisis/apps/ipce/main.cpp b/isis/src/qisis/apps/ipce/main.cpp
index 71d15134f7d5482f641515aad40b691e74eb22a9..7e5b780178e79babf394c7fb7d42ab1f9f115a20 100644
--- a/isis/src/qisis/apps/ipce/main.cpp
+++ b/isis/src/qisis/apps/ipce/main.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include <QDebug>
diff --git a/isis/src/qisis/apps/qmos/main.cpp b/isis/src/qisis/apps/qmos/main.cpp
index 2036d20443b9b74c36edf1c4e1e40049292e3eab..f5804e4f4404a245225a0be018cdca36340b0cd5 100644
--- a/isis/src/qisis/apps/qmos/main.cpp
+++ b/isis/src/qisis/apps/qmos/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include <QCoreApplication>
diff --git a/isis/src/qisis/apps/qnet/main.cpp b/isis/src/qisis/apps/qnet/main.cpp
index 4340d02cd58d4a24a923f8d28828843fa9e76dc8..fbab28d22feddf477a381e2114bcc2d7113d21e1 100644
--- a/isis/src/qisis/apps/qnet/main.cpp
+++ b/isis/src/qisis/apps/qnet/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 #include <signal.h>
 
diff --git a/isis/src/qisis/apps/qtie/QtieFileTool.cpp b/isis/src/qisis/apps/qtie/QtieFileTool.cpp
index 82520d76875aa73fbb9c838d7578a4b69c64cb31..0a756dd0707ec34c0a8a97f3e6f84e3ab8c121d7 100644
--- a/isis/src/qisis/apps/qtie/QtieFileTool.cpp
+++ b/isis/src/qisis/apps/qtie/QtieFileTool.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "QtieFileTool.h"
 
 #include <QApplication>
@@ -42,7 +50,7 @@ namespace Isis {
     saveAction()->setEnabled(false);
   }
 
-  
+
   /**
    *  Open base image and image to be adjusted
    *
@@ -56,7 +64,7 @@ namespace Isis {
    *                            network.
    * @history 2010-05-13  Tracie Sucharski - Use match cube directory to determine
    *                            default directory for cnet.
-   * @history 2012-05-10  Tracie Sucharski - The FileTool::closeAll method no longer 
+   * @history 2012-05-10  Tracie Sucharski - The FileTool::closeAll method no longer
    *                            closes viewports, so re-implemented closing of old
    *                            cube viewports before opening new.
    *
@@ -341,4 +349,4 @@ namespace Isis {
     }
     return true;
   }
-}
\ No newline at end of file
+}
diff --git a/isis/src/qisis/apps/qtie/QtieFileTool.h b/isis/src/qisis/apps/qtie/QtieFileTool.h
index e0d7923f96e237b1edcfd7f34f1ee6ba6ab31be9..0022f8daf2614ae6aee4fef1fc69c878a9fe7aef 100644
--- a/isis/src/qisis/apps/qtie/QtieFileTool.h
+++ b/isis/src/qisis/apps/qtie/QtieFileTool.h
@@ -1,27 +1,14 @@
 #ifndef QtieFileTool_h
 #define QtieFileTool_h
 
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2010/05/12 17:22:27 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "FileTool.h"
 
 
@@ -40,15 +27,15 @@ namespace Isis {
    * @internal
    *   @history 2009-06-10 Tracie Sucharski - Added new signal for opening new
    *                          files.
-   *   @history 2012-05-10  Tracie Sucharski - The FileTool::closeAll method no longer 
+   *   @history 2012-05-10  Tracie Sucharski - The FileTool::closeAll method no longer
    *                          closes viewports, so re-implemented closing of old
    *                          cube viewports before opening new.
-   *   @history 2012-05-15 Tracie Sucharski - Moved much of the error checking out of QtieTool into 
+   *   @history 2012-05-15 Tracie Sucharski - Moved much of the error checking out of QtieTool into
    *                          this class.  Added new method, checkNet to perform error checking
    *                          of input control network.
-   *   @history 2012-06-20 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-06-20 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                          coding standards. References #972.
-   *   @history 2012-10-11 Debbie A. Cook, Updated to use new Target class.  References Mantis tickets 
+   *   @history 2012-10-11 Debbie A. Cook, Updated to use new Target class.  References Mantis tickets
    *                          #775 and #1114.
    *   @history 2016-04-22 Jeannie Backer - Modified to use cube labels to set
    *                           ControlNet's target instead of the TargetName.
@@ -73,7 +60,7 @@ namespace Isis {
       //virtual void exit();
 
     private:
-      bool checkNet(Cube *baseCube, UniversalGroundMap *baseGM, 
+      bool checkNet(Cube *baseCube, UniversalGroundMap *baseGM,
                     Cube *matchCube, UniversalGroundMap *matchGM, ControlNet *cnet);
 
   };
diff --git a/isis/src/qisis/apps/qtie/QtieTool.cpp b/isis/src/qisis/apps/qtie/QtieTool.cpp
index 239da5301b4206cc1b34cef8539f434caf028d51..adbbe4a75c50bea4427630fd7accb3480d5f796b 100644
--- a/isis/src/qisis/apps/qtie/QtieTool.cpp
+++ b/isis/src/qisis/apps/qtie/QtieTool.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "QtieTool.h"
 
 #include <QApplication>
@@ -250,9 +258,9 @@ namespace Isis {
     regMenu->addAction(templateFile);
     regMenu->addAction(viewTemplate);
     //    registrationMenu->addAction(interestOp);
-    
+
     p_whatsThis = new QAction(QIcon(FileName("$ISISROOT/appdata/images/icons/contexthelp.png").expanded()),
-                              "&Whats's This", 
+                              "&Whats's This",
                               p_tieTool);
     p_whatsThis->setShortcut(Qt::SHIFT | Qt::Key_F1);
     p_whatsThis->setToolTip("Activate What's This and click on items on "
@@ -342,9 +350,9 @@ namespace Isis {
    *                           run on new files.
    * @history  2010-05-11 Tracie Sucharski - Moved the creation of control net
    *                           to the QtieFileTool::open.
-   * @history  2012-05-11 Tracie Sucharski - Delete cubes,  A better solution- rewrite 
-   *                           QtieFileTool::open , to pass in filenames only? 
-   *                            
+   * @history  2012-05-11 Tracie Sucharski - Delete cubes,  A better solution- rewrite
+   *                           QtieFileTool::open , to pass in filenames only?
+   *
    */
   void QtieTool::clearFiles() {
     p_tieTool->setVisible(false);
@@ -512,8 +520,8 @@ namespace Isis {
    * @history  2010-05-18 Jeannie Walldren - Modified Point ID
    *                          QInputDialog to return if "Cancel"
    *                          is clicked.
-   * @history 2012-05-10  Tracie Sucharski - If point doesn't exist on 
-   *                          base map, return. 
+   * @history 2012-05-10  Tracie Sucharski - If point doesn't exist on
+   *                          base map, return.
    */
   void QtieTool::createPoint(double lat, double lon) {
 
@@ -795,7 +803,7 @@ namespace Isis {
       //     longitude sigma        = 1000.0
       //     radius sigma           = Null since we are not solving for radius
       //     outlier rejection      = false
-      settings->setSolveOptions(false, false, false, false, SurfacePoint::Latitudinal, 
+      settings->setSolveOptions(false, false, false, false, SurfacePoint::Latitudinal,
                                 SurfacePoint::Latitudinal, 1000.0,1000.0, Isis::Null);
   //************************************************************************************************
       QList<BundleObservationSolveSettings> observationSolveSettingsList;
@@ -883,9 +891,9 @@ namespace Isis {
       message += errors;
 //      message += "\n\nMaximum Error = " + QString::number(outNet.MaximumResiudal());
 //      message += "\nAverage Error = " + QString::number(outNet.AverageResidual());
-      message += "\n\nMaximum Error = " 
+      message += "\n\nMaximum Error = "
                + QString::number(outNet.GetMaximumResidual());
-      message += "\nAverage Error = " 
+      message += "\nAverage Error = "
                + QString::number(outNet.AverageResidual());
       QMessageBox::warning((QWidget *)parent(), "Error", message);
       return;
@@ -948,7 +956,7 @@ namespace Isis {
    */
 
   void QtieTool::setTemplateFile() {
-    
+
     QString filename = QFileDialog::getOpenFileName(p_tieTool,
                        "Select a registration template", ".",
                        "Registration template files (*.def *.pvl);;All files (*)");
diff --git a/isis/src/qisis/apps/qtie/QtieTool.h b/isis/src/qisis/apps/qtie/QtieTool.h
index 7c03a1cf285617c6d0c128b67f9fce5cf3819e88..6c4b3ce5be80df0243173eaca91248a5e08caa36 100644
--- a/isis/src/qisis/apps/qtie/QtieTool.h
+++ b/isis/src/qisis/apps/qtie/QtieTool.h
@@ -1,6 +1,14 @@
 #ifndef QtieTool_h
 #define QtieTool_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QAction>
 #include <QPushButton>
 #include <QToolButton>
@@ -51,9 +59,9 @@ namespace Isis {
    *                            ControlPointEdit
    *   @history 2012-05-10 Tracie Sucharski - Reset pointers to NULL, when creating
    *                            new control point, if doesn't exist on basemap, return.
-   *   @history 2012-05-15 Tracie Sucharski - Moved much of the error checking out of this class 
+   *   @history 2012-05-15 Tracie Sucharski - Moved much of the error checking out of this class
    *                            and into the QtieFileTool class.
-   *   @history 2012-06-20 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-06-20 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                            coding standards. References #972.
    *   @history 2012-10-11 Debbie A. Cook, Updated to use new Target class.  References Mantis
    *                            tickets #775 and #1114.
diff --git a/isis/src/qisis/apps/qtie/main.cpp b/isis/src/qisis/apps/qtie/main.cpp
index 004e928ad18b00a37af047148398751296ba616d..a6f6438a68cc966556d24a7d40b4721f5c77f86f 100644
--- a/isis/src/qisis/apps/qtie/main.cpp
+++ b/isis/src/qisis/apps/qtie/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QApplication>
 #include <QCoreApplication>
 #include <QToolBar>
diff --git a/isis/src/qisis/apps/qview/main.cpp b/isis/src/qisis/apps/qview/main.cpp
index 5dcf578b49f58c95c231db5204ff3296e263e249..b530acea1cfd1360dbb6ad038767c3a5d2c32af6 100644
--- a/isis/src/qisis/apps/qview/main.cpp
+++ b/isis/src/qisis/apps/qview/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include <fcntl.h>
diff --git a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp
index f853ca697094fec2f02fadd0f0019dbf8519077a..662b21906e523e4f4d5a4d96c447c94ea600bb25 100644
--- a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp
+++ b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractPlotTool.h"
@@ -297,7 +305,7 @@ namespace Isis {
 
     connect(newPlotWindow, SIGNAL(closed()),
             newPlotWindow, SLOT(deleteLater()));
-    
+
     QString originalTitle = newPlotWindow->windowTitle();
     QString titleToTry = originalTitle;
     bool titleUsed = false;
@@ -359,4 +367,3 @@ namespace Isis {
     }
   }
 }
-
diff --git a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.h b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.h
index 9c445d81cdba5e62bc999051a1b8b15a097eb63b..b88b36a51f96339b42e9fbfe5eae51d32ec1fe79 100644
--- a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.h
+++ b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.h
@@ -1,6 +1,14 @@
 #ifndef AbstractPlotTool_h
 #define AbstractPlotTool_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // this should be the only include in this file!
 #include "Tool.h"
 
@@ -20,7 +28,7 @@ namespace Isis {
   /**
    * @brief Parent class for plotting tools which provides common functionality
    *
-   * This qview tool is designed to be inherited from by tools which create 
+   * This qview tool is designed to be inherited from by tools which create
    * plots.  This class provides common functionality such as opening new
    * plot windows.
    *
@@ -69,10 +77,10 @@ namespace Isis {
       QList<PlotWindow *> plotWindows();
 
       /**
-       * This will be called when the selected plot window changes.  The 
-       * existing curves need to be detached (forgotten, but not deleted). 
-       * The curves are being detached between the previously selected window 
-       * and the tool. 
+       * This will be called when the selected plot window changes.  The
+       * existing curves need to be detached (forgotten, but not deleted).
+       * The curves are being detached between the previously selected window
+       * and the tool.
        */
       virtual void detachCurves() = 0;
       PlotWindow *selectedWindow(bool createIfNeeded = true);
@@ -82,14 +90,13 @@ namespace Isis {
 
     private:
       /**
-       * This allows the user to select the active plot window.  New curves 
-       * will be drawn into this window. The items in the combo box store 
-       * pointers to the windows themselves so we do not need an explicit list 
-       * of plot windows. 
+       * This allows the user to select the active plot window.  New curves
+       * will be drawn into this window. The items in the combo box store
+       * pointers to the windows themselves so we do not need an explicit list
+       * of plot windows.
        */
       QPointer<QComboBox> m_selectWindowCombo;
   };
 }
 
 #endif
-
diff --git a/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.cpp b/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.cpp
index cf64f2908f3018f85dd986a477726ddd6dc0403a..1d1e1d7c2dbd22acf0c0b75d776d574065e5c404 100644
--- a/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.cpp
+++ b/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractProjectItemView.h"
 
 #include <QAction>
diff --git a/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h b/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h
index 99d0ead6aa4ccebeb4bd64434007ce771da9af81..bf71be263892871a90bd918f76bfd98cddb6aeb0 100644
--- a/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h
+++ b/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h
@@ -1,27 +1,13 @@
 #ifndef AbstractProjectItemView_h
 #define AbstractProjectItemView_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QMainWindow>
 
diff --git a/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.cpp b/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.cpp
index 73e7d5bcd8080d51a9f12a569f8eead6e526a9da..4f0b707aa5b5d52dfce63d97ee4caf6f464d07fd 100644
--- a/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.cpp
+++ b/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ProjectItemViewMenu.h"
 
 namespace Isis {
diff --git a/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.h b/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.h
index 50b7979b8f57e015160455b9953bfe4cb2cf3df4..9e7a0a6aad5ab2385f47c4d9176fa9aae3776dfe 100644
--- a/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.h
+++ b/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.h
@@ -1,27 +1,13 @@
 #ifndef ProjectItemViewMenu_h
 #define ProjectItemViewMenu_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QMenu>
 
diff --git a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp
index 6f3c5baad2f8e5fbf28a81d1062175a600b4b92a..1344583d723f954d83425f8cbe933db23bd00a2b 100644
--- a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp
+++ b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AdvancedTrackTool.h"
 
 #include <QAction>
diff --git a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.h b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.h
index b0a1f414015e9ea1a39cd7809acd4379eca00682..0d4a89f1656793feceb7c35c35bfb4b6ad57f6a5 100644
--- a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.h
+++ b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.h
@@ -1,26 +1,13 @@
 #ifndef Qisis_AdvancedTrackTool_h
 #define Qisis_AdvancedTrackTool_h
-/**
- * @file
- * $Revision: 1.18 $
- * $Date: 2010/06/28 08:47:51 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // The only includes allowed in this file are the direct parents of this class!
 #include "Tool.h"
@@ -98,7 +85,7 @@ namespace Isis {
    *  @history 2019-04-22 Kaitlyn Lee - Added column for oblique pixel resolution. Added
    *                          checkBoxItems and loop to add elments to the AdvancedTrackTool,
    *                          instead of hardcoded method calls. Instead of using the enum,
-   *                          added a method getIndex() that calculates what column the 
+   *                          added a method getIndex() that calculates what column the
    *                          element should be added to. Fixes #2205.
    */
   class AdvancedTrackTool : public Tool {
diff --git a/isis/src/qisis/objs/BandSpinBox/BandSpinBox.cpp b/isis/src/qisis/objs/BandSpinBox/BandSpinBox.cpp
index 4fff0158c1debc6129f011b07d88edd1ab27e21c..1dc27b68d73544e95d4b73a0383345b45b1ce1db 100644
--- a/isis/src/qisis/objs/BandSpinBox/BandSpinBox.cpp
+++ b/isis/src/qisis/objs/BandSpinBox/BandSpinBox.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 
 #include "BandSpinBox.h"
diff --git a/isis/src/qisis/objs/BandSpinBox/BandSpinBox.h b/isis/src/qisis/objs/BandSpinBox/BandSpinBox.h
index 50464af65fe33ac18cbc17e46f2766b05d73e556..2262007a8fd6f6ed9d80e265e91b13febe2a24f4 100644
--- a/isis/src/qisis/objs/BandSpinBox/BandSpinBox.h
+++ b/isis/src/qisis/objs/BandSpinBox/BandSpinBox.h
@@ -1,6 +1,14 @@
 #ifndef BandSpinBox_h
 #define BandSpinBox_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QSpinBox>
 #include <QMap>
 
diff --git a/isis/src/qisis/objs/BandTool/BandTool.cpp b/isis/src/qisis/objs/BandTool/BandTool.cpp
index 52f4561823726be532645be72acc68bc1df94efc..0f1ac78b32e4ab16868873d9a7ee5707084d80d9 100644
--- a/isis/src/qisis/objs/BandTool/BandTool.cpp
+++ b/isis/src/qisis/objs/BandTool/BandTool.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BandTool.h"
 
 #include <QAction>
@@ -248,7 +256,7 @@ namespace Isis {
    * This method fills the p_comboBox with the keywords from the
    * band bin group of the currently selected cube. If the current
    * cube viewport doesn't have a currently chosen value for the
-   * p_comboBox, then 'Center' is chosen as the default. 
+   * p_comboBox, then 'Center' is chosen as the default.
    *
    * @param pvl
    */
diff --git a/isis/src/qisis/objs/BandTool/BandTool.h b/isis/src/qisis/objs/BandTool/BandTool.h
index 783caa712f43241b94049e80b747af1558bdb2d1..9e31b3f2a2c75e8eb37bcba8319e993b31b07447 100644
--- a/isis/src/qisis/objs/BandTool/BandTool.h
+++ b/isis/src/qisis/objs/BandTool/BandTool.h
@@ -1,6 +1,14 @@
 #ifndef BandTool_h
 #define BandTool_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Tool.h"
 
 // FIXME: remove this include
diff --git a/isis/src/qisis/objs/BlinkTool/BlinkTool.cpp b/isis/src/qisis/objs/BlinkTool/BlinkTool.cpp
index 745dac3ca521a29572a588ca89900e67e32db6fa..068b562debb01962cd0ad212892a3c261db6a7fe 100644
--- a/isis/src/qisis/objs/BlinkTool/BlinkTool.cpp
+++ b/isis/src/qisis/objs/BlinkTool/BlinkTool.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BlinkTool.h"
 
 #include "FileName.h"
diff --git a/isis/src/qisis/objs/BlinkTool/BlinkTool.h b/isis/src/qisis/objs/BlinkTool/BlinkTool.h
index 3688e388a7d8f09f57cce736e81655aecf6d873f..6f92bcc6e6b8fd603bb981998f0d884df17d0c61 100644
--- a/isis/src/qisis/objs/BlinkTool/BlinkTool.h
+++ b/isis/src/qisis/objs/BlinkTool/BlinkTool.h
@@ -1,6 +1,14 @@
 #ifndef BlinkTool_h
 #define BlinkTool_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // This is the only include allowed in this file!
 #include "Tool.h"
 
@@ -42,7 +50,7 @@ namespace Isis {
       QString menuName() const {
         return "&Options";
       };
-    
+
     protected:
       void updateTool();
       bool eventFilter(QObject *o, QEvent *e);
@@ -68,4 +76,3 @@ namespace Isis {
 };
 
 #endif
-
diff --git a/isis/src/qisis/objs/BrowseDialog/BrowseDialog.cpp b/isis/src/qisis/objs/BrowseDialog/BrowseDialog.cpp
index c41173b47a7b17613cf2281c344dc67ad997696e..0f97eaf372d87f81240b7e462568017179d788d1 100644
--- a/isis/src/qisis/objs/BrowseDialog/BrowseDialog.cpp
+++ b/isis/src/qisis/objs/BrowseDialog/BrowseDialog.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BrowseDialog.h"
 
 #include <QFileDialog>
@@ -73,4 +81,3 @@ namespace Isis {
   }
 
 }
-
diff --git a/isis/src/qisis/objs/BrowseDialog/BrowseDialog.h b/isis/src/qisis/objs/BrowseDialog/BrowseDialog.h
index 739a74b9949f2e9a1210dfba4637e9ba6c35aee5..97e72878103cd580399000d008babd1ffc8802cc 100644
--- a/isis/src/qisis/objs/BrowseDialog/BrowseDialog.h
+++ b/isis/src/qisis/objs/BrowseDialog/BrowseDialog.h
@@ -1,6 +1,14 @@
 #ifndef BrowseDialog_h
 #define BrowseDialog_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "FileDialog.h"
 
 namespace Isis {
diff --git a/isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp b/isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp
index ebbd350b2377d8c377f0e5e11f57c9da3c819f52..83ce7f21fd636d31627fbe2af5443a5427f29f51 100755
--- a/isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp
+++ b/isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp
@@ -1,23 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "BundleObservationView.h"
 
diff --git a/isis/src/qisis/objs/BundleObservationView/BundleObservationView.h b/isis/src/qisis/objs/BundleObservationView/BundleObservationView.h
index 30cf4fd63e9699484714910980a58ccfe8e3db2f..56252f0887a85b39693a395a104d3306f45ba484 100755
--- a/isis/src/qisis/objs/BundleObservationView/BundleObservationView.h
+++ b/isis/src/qisis/objs/BundleObservationView/BundleObservationView.h
@@ -1,25 +1,13 @@
 #ifndef BundleObservationView_h
 #define BundleObservationView_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractProjectItemView.h"
 #include "FileItem.h"
diff --git a/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp b/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp
index 55bd64abc0bc5d902685c27cc247769ce6fc0573..24e6b82cfcb3a8eb0b503d125a080c4ae035d733 100644
--- a/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp
+++ b/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ChipViewport.h"
@@ -136,7 +144,7 @@ namespace Isis {
    *
    * @param newStretch Pointer to the new stretch to apply
    * @param cvp Pointer to the cube viewport to apply the stretch to
-   */ 
+   */
   void ChipViewport::stretchFromCubeViewport(Stretch *newStretch, CubeViewport *cvp) {
 
     ASSERT(cvp != NULL);
@@ -168,8 +176,8 @@ namespace Isis {
 
   /**
    * Locks or unlocks the stretch on the chip viewport during transformations (zoom, pan, etc.)
-   *  
-   * @param newStatus Non-zero locks the stretch 
+   *
+   * @param newStatus Non-zero locks the stretch
    */
   void ChipViewport::changeStretchLock(int newStatus) {
     if (newStatus == 0)
@@ -326,7 +334,7 @@ namespace Isis {
   }
 
 
-  /**  
+  /**
    * Load with info from given ChipViewport
    *
    * @param newView The chip viewport to load from
@@ -385,7 +393,7 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    * Pan left
    */
   void ChipViewport::panLeft() {
@@ -604,8 +612,8 @@ namespace Isis {
    * Slot to geom chip (apply geometry transformation)
    *
    * @param matchChip The matching chip for the geometry
-   * @param matchChipCube The matching chip's cube for the geometry 
-   * 
+   * @param matchChipCube The matching chip's cube for the geometry
+   *
    * @internal
    *   @history 2010-06-16 Jeannie Walldren - Catch possible iException from Chip's
    *                           Load() method and display in QMessageBox
@@ -633,7 +641,7 @@ namespace Isis {
 
   /**
    * Slot to un-geom chip (revert geometry transformation)
-   * 
+   *
    * @internal
    *   @history 2010-06-16 Jeannie Walldren - Catch possible iException from Chip's
    *                           Load() method and display in QMessageBox
diff --git a/isis/src/qisis/objs/ChipViewport/ChipViewport.h b/isis/src/qisis/objs/ChipViewport/ChipViewport.h
index f68c8959ccd4fcaf2842c80e99024dbb7d1926d2..28bb765381dab746d5029b26e276a79c9dcd9bc7 100644
--- a/isis/src/qisis/objs/ChipViewport/ChipViewport.h
+++ b/isis/src/qisis/objs/ChipViewport/ChipViewport.h
@@ -1,27 +1,13 @@
 #ifndef ChipViewport_h
 #define ChipViewport_h
 
-/**
- * @file
- * $Revision: 1.6 $
- * $Date: 2010/06/17 00:08:45 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QPaintEvent>
 #include <QResizeEvent>
@@ -63,16 +49,16 @@ namespace Isis {
    *   @history 2010-12-01 Eric Hyer - Added stretch locking
    *   @history 2011-06-07 Debbie A. Cook and Tracie Sucharski - Changed point
    *                           type "Ground" to "Fixed".
-   *   @history 2011-06-14 Tracie Sucharski - Added mouseClick signal.  Qnet 
+   *   @history 2011-06-14 Tracie Sucharski - Added mouseClick signal.  Qnet
    *                           needed to know if user moved the tackpoint vs.
    *                           simply loading a new chip, or geoming the chip.
-   *   @history 2011-06-15 Tracie Sucharski - Changed signal mouseClick to 
+   *   @history 2011-06-15 Tracie Sucharski - Changed signal mouseClick to
    *                           userMovedTackPoint.
    *                           //TODO  Could not use tackPointChanged signal
    *                           because that signal is emitted whenever the
    *                           measure is loaded not just when the user
    *                           initiates the move.  This should be cleaned up.
-   *   @history 2011-09-14 Tracie Sucharski - Added user option to determine 
+   *   @history 2011-09-14 Tracie Sucharski - Added user option to determine
    *                           whether control points are drawn.
    *   @history 2012-07-26 Tracie Sucharski - Added method to return zoom factor and
    *                           slot to zoom to a specific zoom factor.
@@ -250,7 +236,7 @@ namespace Isis {
       // that either NULL or a valid ControlNet is being pointed to).
       ControlNet *m_controlNet;
 
-      bool m_stretchLocked; //!< Whether or not to lock the stretch when transforming 
+      bool m_stretchLocked; //!< Whether or not to lock the stretch when transforming
       Stretch *m_stretch;   //!< Current stretch on the chip viewport
   };
 };
diff --git a/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp b/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp
index c5b35a74799318a24d3dbc191a5352c4bf47158d..8b7a4fde09ea114bc1a44fe3f3e388625aac9711 100644
--- a/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp
+++ b/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ChipViewportsWidget.h"
@@ -151,11 +159,11 @@ namespace Isis {
   /**
    * New control network being edited
    *
-   * @param cnet ControlNet * 
-   * @param filename Qstring,  Need filename to write to widget label.  ControlNet doesn't 
-   *                       contain a filename. 
+   * @param cnet ControlNet *
+   * @param filename Qstring,  Need filename to write to widget label.  ControlNet doesn't
+   *                       contain a filename.
    * @internal
-  */  
+  */
   void ChipViewportsWidget::setControlNet(ControlNet *cnet, QString cnetFilename) {
 //    qDebug()<<"ChipViewportsWidget::setControlNet cnet = "<<cnet<<"   filename = "<<cnetFilename;
     //  TODO  more error checking
@@ -375,4 +383,3 @@ namespace Isis {
     }
   }
 }
-
diff --git a/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.h b/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.h
index 8c0ae606876e9368d7d09d5b343c7ffd3f8ba059..d89c22c2ab4bf5a102f0446cc8a678c1c3dd2c62 100644
--- a/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.h
+++ b/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.h
@@ -1,6 +1,14 @@
 #ifndef ChipViewportsWidget_h
 #define ChipViewportsWidget_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlPoint.h"
 
 #include <QWidget>
@@ -30,7 +38,7 @@ namespace Isis {
    *
    * @author 2016-06-15 Tracie Sucharski
    *
-   * @internal 
+   * @internal
    */
   class ChipViewportsWidget : public QWidget {
     Q_OBJECT
diff --git a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp
index 38e02045a56f26af3349bc8bf40f03b877c7079a..f47aac6bdb88a049eb18080bdac6be280acf8bdf 100644
--- a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp
+++ b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "CnetEditorView.h"
diff --git a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.h b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.h
index f7a2ba860e731d3465b1ce7ce1887312c3d0a758..73a67a98d9bb664925ede97235ccd00dbdcc2c2f 100644
--- a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.h
+++ b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.h
@@ -1,27 +1,14 @@
 #ifndef CnetEditorView_h
 #define CnetEditorView_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QList>
 #include <QMap>
 #include <QPointer>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp
index fc6e6099323f3e059bd54e2a88b7b7d7d4826328..d53301de923238c0e4f41e48f1c2cf858e19b8c3 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "APrioriLatitudeFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.h
index e091fd5fc585430823a39c0a638a0bd9dcac5e9b..225979ba6130f711c5502a559f347a3c14f49c38 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.h
@@ -1,6 +1,14 @@
 #ifndef APrioriLatitudeFilter_H
 #define APrioriLatitudeFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp
index c11b94ddf649c03c6323eb977bc3e7899e6405a3..90cb9e22a4d98992424c52fd91bcb7db3611664d 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "APrioriLatitudeSigmaFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.h
index f9e3487e795608747ce628a46dcd25affd9ab45f..6bfa8462298350f9e361b6f67486021072a69265 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.h
@@ -1,6 +1,14 @@
 #ifndef APrioriLatitudeSigmaFilter_H
 #define APrioriLatitudeSigmaFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp
index e72c25104aacc9f82d7f668f40e10ebf6c08ef1f..56ce1a1579c7a47f99044979f0da3e98ed34311d 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "APrioriLongitudeFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.h
index c7fff3bedb9a5a0e81ac49e82032e05e201818bc..6b6f7b0c96d57bc420f1d34d867ec6a96e694d47 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.h
@@ -1,6 +1,14 @@
 #ifndef APrioriLongitudeFilter_H
 #define APrioriLongitudeFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp
index d692e0991650d82e3fa5e1748a7269397356f2de..57b62f73fa62ab72e07d3d11d7a63a20aedf32cc 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "APrioriLongitudeSigmaFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.h
index 66938c2f1aaa5c3ed5b15fe788096e30bfc5e9f3..a8a56e6b1fcf501e1ddd2706d48e2357544ccf6d 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.h
@@ -1,6 +1,14 @@
 #ifndef APrioriLongitudeSigmaFilter_H
 #define APrioriLongitudeSigmaFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp
index c98beea0b0305728a5202758231db2d852610bf7..ae3cb0c96f5a137e95219c409449205caf61f34a 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "APrioriRadiusFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.h
index 246965d11f7cb54b44d9bd1302bc98ca5f0149d4..5e0a6b0bfe368822772b9bc0208ea26cf2119a3c 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.h
@@ -1,6 +1,14 @@
 #ifndef APrioriRadiusFilter_H
 #define APrioriRadiusFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp
index 802c953f3bc128705e7544772191f0d6c78735dc..fcb22dc1531b3a14652041ca116c408b9a9ee73e 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "APrioriRadiusSigmaFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.h
index 912d42bdcb9504e749e654b9994bc6b626de26c3..6e0ee58fa923e51466969c62c850690cda8a821d 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.h
@@ -1,6 +1,14 @@
 #ifndef APrioriRadiusSigmaFilter_H
 #define APrioriRadiusSigmaFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp
index 79d3f44aecbc2b76e1de431bc1f3413117c504dd..ede813b5dc18f32436d77b38dbbafdab772e072c 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include <iostream>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.h
index f148d632c317c3cfe2a70788cb340d4a89c338b8..41aa0f150a4e21f4b65036ebad5ea0d1b0a50bf8 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.h
@@ -1,6 +1,14 @@
 #ifndef AbstractFilter_H
 #define AbstractFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QWidget>
 
 class QBoxLayout;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp
index 13a28806b7ed59e40d10f8f227992f92583905e7..77fcd78cd94d104187c3a7ef7d9361024cd15cca 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractFilterSelector.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.h
index 9f7d468cd3dfbe10a38bba03b0e99572f71e0033..38ab4332fa79673d26aac3ac9589a32ab82fc51f 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.h
@@ -1,6 +1,14 @@
 #ifndef AbstractFilterSelector_H
 #define AbstractFilterSelector_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 // parent
 #include <QWidget>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp
index 2e12f4b25b4c0eb7ab626e684c970ac6964d6e0d..4b41f7f281d525de596dbf510cc1661d75a4c7a7 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractImageItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.h
index d14fe1ecd54ea88c0ddcfcd40451f8189171195e..50507583d2f44a80de04385f464e055336867b81 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.h
@@ -1,6 +1,13 @@
 #ifndef AbstractImageItem_H
 #define AbstractImageItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractTreeItem.h"
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp
index 74c3a17f9195597d5ef8164866637c41d63097d7..debe552b9b9191cddbd19595fa0d0f11919a7ce6 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractLeafItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.h
index dc6977bd9515876e73a7181fed1dca6867b47137..3cc735bff28330254fd0f982e98fa2b10e8f3211 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.h
@@ -1,6 +1,13 @@
 #ifndef AbstractLeafItem_H
 #define AbstractLeafItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractTreeItem.h"
 
@@ -18,8 +25,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class AbstractLeafItem : public virtual AbstractTreeItem {
     public:
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp
index 883d967fd47d8297a0936d130934086b165d89db..941b33a0aa3456b93d01c54329890d21b237bbee 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractMeasureItem.h"
@@ -416,4 +424,3 @@ namespace Isis {
     }
   }
 }
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.h
index d18899855dd498012e1e1d8279c1de5c6b589f40..b08e919a49e96b24eecaabaf001e9a4867df4bde 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.h
@@ -1,6 +1,14 @@
 #ifndef AbstractMeasureItem_H
 #define AbstractMeasureItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "AbstractTreeItem.h"
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp
index 2c14883dd533335f7ac161694b2889f3e168c666..805e8740b8a738c45cf45fbbb4ba5b2a0bd12f88 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractMultipleChoiceFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.h
index c5103cafcd19dca0ddede3d12431c6f34e271b7e..75a50071242236fde65eb87020120f9db0278e62 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.h
@@ -1,6 +1,13 @@
 #ifndef AbstractMultipleChoiceFilter_H
 #define AbstractMultipleChoiceFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // parent
 #include "AbstractFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp
index a1749e9fcbe2cc005c53099b88a03204567bce32..a76ad39c869a789e134b6a7f266350b99c439d1c 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractNullDataItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.h
index 57bc4869b8be5c254e8a0f3bc645d7c6e7cfca69..bbaf666791f6aa273b0acebee3863ed751bf8864 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.h
@@ -1,6 +1,13 @@
 #ifndef AbstractNullDataItem_H
 #define AbstractNullDataItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractTreeItem.h"
 
@@ -19,8 +26,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class AbstractNullDataItem : public virtual AbstractTreeItem {
       Q_OBJECT
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp
index c542028d2fc33b594862f901998a5b166a6396bb..309f60dfde2fccbe7dccb6e1c6e899298d12b84a 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractNumberFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.h
index 0b86eba5ed33753c225355c9292d7a480c30ceab..85b04688086b760f4b426fa1edb9bdbdcc54baa2 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.h
@@ -1,6 +1,13 @@
 #ifndef AbstractNumberFilter_H
 #define AbstractNumberFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // parent
 #include "AbstractFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp
index fb71ff87a06d822f5a76ce491a7d8836103af7a8..0f8b16a59cb32858336e103d27cca7c604930b62 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractParentItem.h"
@@ -110,4 +118,3 @@ namespace Isis {
     m_lastVisibleChild = child;
   }
 }
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.h
index 8b1614765a968a970cd3fa98d8d535a28c376a82..4742efd796c238846642e703c0a8d53370efb882 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.h
@@ -1,6 +1,13 @@
 #ifndef AbstractParentItem_H
 #define AbstractParentItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractTreeItem.h"
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp
index fee107c790753d7af0bb3c157a034639c5da28fe..2c03482b21978ff2f63e2b4ece37a8049388a912 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractPointItem.h"
@@ -559,4 +567,3 @@ namespace Isis {
     return surfacePoint;
   }
 }
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.h
index e20fef0ffc8f3bb898cfabc31a7a28cf6a6a7158..32dcfac49901c016d26400c5136ac14d81dde240 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.h
@@ -1,6 +1,14 @@
 #ifndef AbstractPointItem_H
 #define AbstractPointItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractTreeItem.h"
 
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp
index bd11a847bd15b3b03d3d9ed73cd1044a152790ed..fee54ba1e28c2ed3e42df89822d7e690fec40ee6 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractStringFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.h
index e7f2f12c26b69c38256a7cba3c89a91429403dd5..521a207818422e0dceaec5fc9edc9dfddb1a203f 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.h
@@ -1,6 +1,14 @@
 #ifndef AbstractStringFilter_H
 #define AbstractStringFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractFilter.h"
 
 class QLineEdit;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.cpp
index 5c8cb5a98f52f1078fd1ebc31ae2683a5ed71a5f..f2e02ba42cbb6cfec9ef80cbd08692a6b4879ced 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractTableDelegate.h"
 
 namespace Isis {
@@ -8,4 +16,3 @@ namespace Isis {
   AbstractTableDelegate::~AbstractTableDelegate() {
   }
 }
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.h
index 77a0301592b82633a1a3e65fb4039cad1bebc720..880045c694749bcbb78e6d08045bd837a5a012ac 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.h
@@ -1,6 +1,14 @@
 #ifndef AbstractTableDelegate_H
 #define AbstractTableDelegate_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QObject>
 
 class QString;
@@ -19,8 +27,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class AbstractTableDelegate : public QObject {
       Q_OBJECT
@@ -46,4 +54,3 @@ namespace Isis {
 }
 
 #endif
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp
index 35a401a736181112efa440bf475d12eb6e51e153..04c997ce087198d8e2122fb9fceb7474812def6b 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include <cmath>
@@ -575,4 +583,3 @@ namespace Isis {
     return m_interruptFlag != 0;
   }
 }
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.h
index 255c60fd118142430fe5f49c143551a014e194b5..d8cf1767e6888d1866cbcb65406a487de9bafd89 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.h
@@ -1,6 +1,14 @@
 #ifndef AbstractTableModel_H
 #define AbstractTableModel_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QException>
 #include <QExplicitlySharedDataPointer>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp
index 02b48829c47e4ac203c492a27de8aa072115c844..62e4c3bd1f5519edaa2f1ed2f5f98edd7fde4a90 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractTreeItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.h
index 0bf13463a5a0ea24dbeaf6145fd143bef47f1bc9..ce438197cd803d73b9fc9d62e3ab47f656ba1bba 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.h
@@ -1,6 +1,14 @@
 #ifndef AbstractTreeItem_H
 #define AbstractTreeItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QObject>
 
 class QFontMetrics;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp
index a199891bf347d88e44c87cbbb567c7de4bfbf918..b13be72e96ce6a4a1e798e7f0ebdb9034cf8673e 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AbstractTreeModel.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.h
index ffaed462909cc4b76822405a5b8774f598fbc07d..191952fcf278f869fedbe57ca85e8d8a0810bf31 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.h
@@ -1,6 +1,14 @@
 #ifndef AbstractTreeModel_H
 #define AbstractTreeModel_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QObject>
 
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp
index 79b2bcaec03aa5eb7990a2b4d036f696c307a8de..09fc929752ec20e0debd1d1b4eb39fbe269ce072 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AdjustedLatitudeFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.h
index ff593be85271f22b2c3e357910d3e1a5667c833d..2b1fa5c67cceaad460f19bf06a4a1a172beb02c0 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.h
@@ -1,6 +1,14 @@
 #ifndef AdjustedLatitudeFilter_H
 #define AdjustedLatitudeFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp
index 5d43155d3e2a7db6c42e903182bf404531257ad6..1d0288b5daa153fef890d68aeb3b5016c9ac737b 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AdjustedLatitudeSigmaFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.h
index 51b6e9a59a9bd868e9d25b1656dca0e01c6edb7b..b64afec72e5200a710135ae241752d5ddbb17404 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.h
@@ -1,6 +1,14 @@
 #ifndef AdjustedLatitudeSigmaFilter_H
 #define AdjustedLatitudeSigmaFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp
index 0f330ac0b2cde80781064dab0cff79d9bc8b4295..50531713520c5b6f8dc9cc486db00d51bb3dd967 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AdjustedLongitudeFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.h
index c5f3abf2b50c175820ff21b28ad0de0af2859018..503e1c7de36fa2d6980b499708bb2d5f38e99c4a 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.h
@@ -1,6 +1,14 @@
 #ifndef AdjustedLongitudeFilter_H
 #define AdjustedLongitudeFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp
index b8657441a500cc825aecc08ac8874f12772fc954..b0b5e92dff08b87e1d0353ed39170cfcd607dd2a 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AdjustedLongitudeSigmaFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.h
index 35d4b2748cd4f270c3893b6dfd89da74d4b6a476..eb971cf026c59fb4d7765b261a76c902b25d2ecc 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.h
@@ -1,6 +1,14 @@
 #ifndef AdjustedLongitudeSigmaFilter_H
 #define AdjustedLongitudeSigmaFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp
index b6c9d9c5bc2364bb4dd6bfe46480a76cfb9e7b7b..21df29e4b7b76211e76a2fd941fa43b3316812b6 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AdjustedRadiusFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.h
index 06ec01d6c84e4d026d2fe6211e291d649d37a2ea..377ed3e17141fdf9adff54f7c5c787959a4e8e67 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.h
@@ -1,6 +1,14 @@
 #ifndef AdjustedRadiusFilter_H
 #define AdjustedRadiusFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp
index 034991a40445083f6e3b86052b594b5f4b7ae0f0..d6721c41987b0268854236b748719aba733c7732 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "AdjustedRadiusSigmaFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.h
index 563417aea3399405cc33afe9c2c1c01c0936b1a5..0403a1b4c7031ee7e88558872e8a3f0311f84283 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.h
@@ -1,6 +1,14 @@
 #ifndef AdjustedRadiusSigmaFilter_H
 #define AdjustedRadiusSigmaFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.cpp
index 4bf9838535f7294317aa4d9a23e2077e7ebae401..5394d8eb2fce4af7b3aa6ba91cb43e4988e7c420 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BusyLeafItem.h"
 
 #include <QVariant>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.h
index 20de6afbcdff92dd49a8cd936cf349b4b2cca1f2..89616a729ad98832052f2840f710d9f71c71f7eb 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.h
@@ -1,6 +1,14 @@
 #ifndef BusyLeafItem_H
 #define BusyLeafItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractLeafItem.h"
 #include "AbstractNullDataItem.h"
 
@@ -19,8 +27,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class BusyLeafItem : public AbstractNullDataItem, public AbstractLeafItem {
       Q_OBJECT
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp
index bd1b2b56e2c7c113b2b08ebd48400aeda11ebed5..919474cd57a3b381afa1d8a068df61cd596e3e23 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ChooserNameFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.h b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.h
index 02a3466a74d0741d1b48cf31421aaff17e1c1666..cf4a9fec4d85caa22f55bcb1493217e2888f9894 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.h
@@ -1,6 +1,14 @@
 #ifndef ChooserNameFilter_H
 #define ChooserNameFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractStringFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp
index 77404b7b6c67ca606b69d177f66cac97ae58d947..911e5c93846ffd7978d353ac15aec072f7237fd9 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "CnetDisplayProperties.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.h b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.h
index 485713f03519401788f3e560a4e3f040ca57cda3..130bf5d95a806e54f0cf42c818aea71213165699 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.h
@@ -1,6 +1,13 @@
 #ifndef CnetDisplayProperties_H
 #define CnetDisplayProperties_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QObject>
 
@@ -96,4 +103,3 @@ namespace Isis {
 }
 
 #endif
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.cpp b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.cpp
index b328810050d329bda03f513f83675f9399630509..037417456b6c01bbd69cab58594c72dd03c42f27 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CnetEditorSortConfigDialog.h"
 
 #include <limits>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.h b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.h
index 3223a6054d5961def496a94c8b0de402cbd5813b..d195c5c5159aee4e8a64bf8715f1299bfaea8b09 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.h
@@ -1,6 +1,14 @@
 #ifndef CnetEditorSortConfigDialog_h
 #define CnetEditorSortConfigDialog_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDialog>
 #include <QPointer>
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp
index e3c3eebe4d411c5dd33a9f9718a89a0681267f5b..381011f6e3364685aaf70a01d1ac33a73fc6ad61 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "CnetEditorWidget.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.h b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.h
index 80dab915de1592fb4cf85d834db6ed9cae542946..07aa672c0fad4f6d8ac82a03bb4e01699791a260 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.h
@@ -1,6 +1,14 @@
 #ifndef CnetEditorWidget_H
 #define CnetEditorWidget_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QWidget>
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp
index 2824c1ede76c8978163f05f261619ebd3732c992..aefbb9f937d11517807d76ae7cc3b91842cd2035 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ConnectionParentItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.h b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.h
index 5f09abd8c805534105d8db9728de89586cc5c2ec..a712678f6321b8bfb085fea050e943e621694764 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.h
@@ -1,6 +1,13 @@
 #ifndef ConnectionParentItem_H
 #define ConnectionParentItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractImageItem.h"
 #include "AbstractParentItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp
index 442b268d9a1e765da83e34f90aa5dc0ef38f50ac..09b3ced541d7854f7dee5ea2b8c302aedc1ee877 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "FilterGroup.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.h b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.h
index d5889966af8eccdb53b0f738f49644bef1fbff64..a52b7a56dfd9da62a05aea93c98a93e1a19db620 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.h
@@ -1,6 +1,13 @@
 #ifndef FilterGroup_H
 #define FilterGroup_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // parent
 #include <QWidget>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp
index 2fef8a559d483d75d439fc4bdcaf6d1cd1bac614..eb909029d8e43d05a9b9abc8eef02162d4b76404 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "FilterWidget.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.h b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.h
index bb10ec6dbebbf036505991e1fd6b3276e2975318..6d70819e0aae4ddaee05f85885bcfd8102abdc81 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.h
@@ -1,6 +1,13 @@
 #ifndef FilterWidget_H
 #define FilterWidget_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // parent
 #include <QWidget>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp
index 7dd671821d36688df9f61bfb53599abddc2bca29..a12739f2a9b576e7b58e3403fe352d661c07d9a2 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "GoodnessOfFitFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.h b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.h
index b75f86474a00619f2d9fc02a8d8328efe2b112a3..341a599bd835c4f72db95f0db84abc2756b51036 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.h
@@ -1,6 +1,14 @@
 #ifndef GoodnessOfFitFilter_H
 #define GoodnessOfFitFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp
index 8f041b5b929c72ef14b35afd463d7d486d969686..1411f52956c4e8398bad4586052561dbec6e61cd 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ImageIdFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.h b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.h
index e7ef1e6cf3cbf25f91ce45d622d6731bf6470e7e..3e86a8f6b2ff1c6e9acd3491b0b65afabef4eaf2 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.h
@@ -1,6 +1,14 @@
 #ifndef ImageIdFilter_H
 #define ImageIdFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractStringFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp
index 9a7ebad600bda0c66c8c506e40bbeb941c8608b0..606da610e38f4cf2a3eb00e9d7d809d68de2bf69 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ImageImageFilterSelector.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.h b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.h
index c0ecb6b26332a2054feb81c80d51d7fc404cc27a..d12931186e6c3c2d33677b9d80933afc1e2ea0a5 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.h
@@ -1,6 +1,13 @@
 #ifndef ImageImageFilterSelector_H
 #define ImageImageFilterSelector_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractFilterSelector.h"
 
@@ -16,8 +23,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *  @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *  @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class ImageImageFilterSelector : public AbstractFilterSelector {
       Q_OBJECT
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp
index 50ad80710854f2d289cb77d03d3f231caa181e18..b1589790db12e42d23d18ff9a0bf32731c132b5b 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ImageImageTreeModel.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.h b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.h
index e595a254518e22817609ab45216b62f7fddc5c1e..f845269468f45d145bc68e996933fa3498d114ed 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.h
@@ -1,6 +1,13 @@
 #ifndef ImageImageTreeModel_H
 #define ImageImageTreeModel_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // parent
 #include "AbstractTreeModel.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp
index bcdcac8f2dd98304acdc94131fca63867855881c..cf37d9c44437ea21ffb0b2284c4cc7d86c4828b7 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ImageLeafItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.h
index c9cb9dd2a4adf361565da5d50a9da1bf52191d6e..e3334fdafe7416ee135571f1e3e008372f796c11 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.h
@@ -1,6 +1,14 @@
 #ifndef ImageLeafItem_H
 #define ImageLeafItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QString>
 
 #include "AbstractImageItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp
index d99de2b36a559bce265e55c4d41fb971300ca244..45a1e58ed4bea37ec24ebbf8538312f032d50f73 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ImageParentItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.h b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.h
index 82777e57c9661a367bd4d52b020de06be6f9923e..b1d340f864dfaa83834fca115ba78b8794ebbd59 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.h
@@ -1,6 +1,14 @@
 #ifndef ImageParentItem_H
 #define ImageParentItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QString>
 
 #include "AbstractImageItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp
index dffafa341511fcaac4b992e0b623938052e04739..f2f5e55ea53c64cfb31649dcc9bfcfbb6c965547 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include <algorithm>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.h b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.h
index a18ddb8302543c78bbb50af0178f44a9524bc6c6..7af778b8f5c62ab853258e246d207c3216e6760f 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.h
@@ -1,6 +1,14 @@
 #ifndef ImagePointFilterSelector_H
 #define ImagePointFilterSelector_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "AbstractFilterSelector.h"
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp
index c22981e1ce6a5ecaec42646778ab6601ca15d433..980af55f17e396924ff89510af815cd4f9aeb5e3 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ImagePointTreeModel.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.h b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.h
index 02347d9c34c8bd8736d63bf049c5f1ca132efb37..19d780ce26af12b53d997135d66ec2074fa571b9 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.h
@@ -1,6 +1,14 @@
 #ifndef ImagePointTreeModel_H
 #define ImagePointTreeModel_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // parent
 #include "AbstractTreeModel.h"
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp
index 3a51b82c4b84f00de4dedf10f52f0ecb5b8bf105..bc8b5838e11a246b087fbc07aaf3016bbc1b72ad 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "LineFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.h b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.h
index 7b7ae9ec8900d4954d8913221ca48b2f4a587de8..6f39e69ac3e793a5570cc43a10fec8fc12c91519 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.h
@@ -1,6 +1,14 @@
 #ifndef LineFilter_H
 #define LineFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp
index 0091e3be206b493570453389aa97facf10e0b16b..1a58930804e20aa7836447f4011bcc1fb8eef492 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "LineResidualFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.h b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.h
index 95e56ed37dbc529b50f28dd3e0c6ebb529969976..77bc3082b33bebf611dab199585625044f5b25b6 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.h
@@ -1,6 +1,14 @@
 #ifndef LineResidualFilter_H
 #define LineResidualFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp
index a4742086e078324de11342d0916301e93482d4d8..f9b746409be4d5c74c0b7235453c79d66fde1287 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "LineShiftFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.h b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.h
index 298dc1ea7a6f47fe2057d0fcdb9385e095849082..d16b1828ee5388da73c8db39e8f03b9c56abea47 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.h
@@ -1,6 +1,14 @@
 #ifndef LineShiftFilter_H
 #define LineShiftFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp
index 8a78023184e1e3e545fcaa2442afb74f592bdaf2..2117833bdf4fe832ea0ffdf1872a49abb66311c2 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "MeasureCountFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.h
index a3a66c6a13663600190f484a555cf26e3c85cc44..2bb499e6c4a42bf2f4f00252dd0f3883f8b87ad3 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.h
@@ -1,6 +1,13 @@
 #ifndef MeasureCountFilter_H
 #define MeasureCountFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractFilter.h"
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp
index db1bc8fa7f8228f3fe6ce667d88d3f7e971d5758..c6c96a06f7f2be4f60d62b4755698001d43ae186 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "MeasureIgnoredFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.h
index d09ef753121d9f9de3c68d48e6ffd9474cf90237..8733f35ffbb7693370c3e3cf8e575750d6076c5e 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.h
@@ -1,6 +1,14 @@
 #ifndef MeasureIgnoredFilter_H
 #define MeasureIgnoredFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp
index 01a034cb661670ef83502430d9fcd7ae868ed12d..09e83998a3fff69376816ed54aae0e73bcff19bd 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "MeasureJigsawRejectedFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.h
index cfecbb11aee7c18f7e48fd5c351b7c9cc470d7fa..1cdd2facdfde20b039abbf9f679f78963e091098 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.h
@@ -1,6 +1,14 @@
 #ifndef MeasureJigsawRejectedFilter_H
 #define MeasureJigsawRejectedFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp
index 7261b973ed9303699516279d2d71357fa6a06659..58da2e53ab14510d1f690ff52a1b35c7ed355f32 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "MeasureLeafItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.h
index 6c1959c376e74880cfd39a81ae9d3c23bb922619..a0e2bc53f55c35cf9ba0d16823bbd889a624f549 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.h
@@ -1,6 +1,14 @@
 #ifndef MeasureLeafItem_H
 #define MeasureLeafItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "AbstractMeasureItem.h"
 #include "AbstractLeafItem.h"
@@ -18,8 +26,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class MeasureLeafItem : public AbstractMeasureItem, public AbstractLeafItem {
     public:
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp
index e069b2c13283877ba86d5d6dcec1a92218c9b115..281d640b76a9e4d2b2ed89f3cbc52508dbf3f72d 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "MeasureTableDelegate.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.h
index 993b2e0d0945e613b921cb8648626b581d138a7f..7659fbdd8ddca31a2a9d17aaea8b3184823e5cff 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.h
@@ -1,6 +1,14 @@
 #ifndef MeasureTableDelegate_H
 #define MeasureTableDelegate_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractTableDelegate.h"
 
 class QString;
@@ -19,8 +27,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class MeasureTableDelegate : public AbstractTableDelegate {
     public:
@@ -46,4 +54,3 @@ namespace Isis {
 }
 
 #endif
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp
index cc9da3caac61304068fecf48a0dfe2679562e32d..601d86c912271e74335273027a24bb5f8d90e238 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "MeasureTableModel.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.h
index 95173c307b53aaf65eb2c25e7ace17f1a72b3a79..ffb14db90139abf65f6cd0ae42b896413b607fc3 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.h
@@ -1,6 +1,13 @@
 #ifndef MeasureTableModel_H
 #define MeasureTableModel_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractTableModel.h"
 
@@ -29,8 +36,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class MeasureTableModel : public AbstractTableModel {
       Q_OBJECT
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp
index 4b2b9daaae5fc637c8b8fba5c637ecee7bc05605..09801a24302dc229e3faff3f1bf524a738c744ac 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "MeasureTypeFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.h
index 5b2fa0ba15016da645c6a3a606fec3b7cdf46101..8ffaa71385a3568ef14eaa8f03fee56c38c5b58b 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.h
@@ -1,6 +1,14 @@
 #ifndef MeasureTypeFilter_H
 #define MeasureTypeFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractMultipleChoiceFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp
index c351b97ff3380298ee09c9f35e7c4af03927402e..c89db7e0d5e27bde4f0d14484dd645469dee53c8 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointEditLockedFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.h
index 2f3048b6905bdca6ce175969c416bfe098411872..8746d7deab2d752aa8d94a787e082d1b6bb751a6 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.h
@@ -1,6 +1,14 @@
 #ifndef PointEditLockedFilter_H
 #define PointEditLockedFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp
index 43e6810f106f8cce19163ded09c19f83c6ef55a1..0981418614d4fd6c8dd889d4c5ffd0270e492a62 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointIdFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.h
index 34da4e35ef275fa068132f146eb607805beaa928..de7677f85fc4a099e99dc321487ca758be84adf0 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.h
@@ -1,6 +1,14 @@
 #ifndef PointIdFilter_H
 #define PointIdFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractStringFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp
index 440fddb93b734444682333472ced150b27102e7d..f5b490ba20d868f6134764639ded5ce4ac52b035 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointIgnoredFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.h
index 7ef7d2e2676c77a5b91154639bfe20b28e11106c..2f7b22ffa8dd446cbc16de6fb8d64873bde364ed 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.h
@@ -1,6 +1,14 @@
 #ifndef PointIgnoredFilter_H
 #define PointIgnoredFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp
index 0d628de472bd23fc534e548e6b7a26fac78fa003..02cf4e5ddffde0b63e5c454f3c97a159404bd607 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointJigsawRejectedFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.h
index 928c1d99abf20e0f54a8f950c55771610ff5b57a..bbc036a76b768c8b7f0d8b19fdc5c2da7e47342e 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.h
@@ -1,6 +1,14 @@
 #ifndef PointJigsawRejectedFilter_H
 #define PointJigsawRejectedFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp
index fb420f7a5b1487c1cff0abc05948a93ef75e3a14..8815299f586ad781c5f4ff4583f9bc30484592f0 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointLeafItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.h
index 9bd4cec3253a0fe6a0e33bd548053a6a469c06f9..15b2146aa52d162242a33d509d7f50d15f5dd192 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.h
@@ -1,6 +1,13 @@
 #ifndef PointLeafItem_H
 #define PointLeafItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractPointItem.h"
 #include "AbstractLeafItem.h"
@@ -18,8 +25,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class PointLeafItem : public AbstractPointItem, public AbstractLeafItem {
     public:
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp
index a201c53858cc3443035f99d22e7dff63ea349f55..72ee6d6f99caba6d7353a65a363c9968d6a59389 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointMeasureFilterSelector.h"
@@ -226,4 +234,3 @@ namespace Isis {
     emit filterChanged();
   }
 }
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.h b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.h
index d5b140885cb172a170085c8a59f3db0cf864c6be..c2195fa161c6260c8e2cd655e797e2bae1e37e54 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.h
@@ -1,6 +1,13 @@
 #ifndef PointMeasureFilterSelector_H
 #define PointMeasureFilterSelector_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractFilterSelector.h"
 
@@ -16,8 +23,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class PointMeasureFilterSelector : public AbstractFilterSelector {
       Q_OBJECT
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp
index 544b14cb6efb0289e648403fa325881ae13a3477..483489dda82e831fa9f1d3a53040b6905f956fde 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointMeasureTreeModel.h"
@@ -125,4 +133,3 @@ namespace Isis {
     }
   }
 }
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.h b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.h
index 93d0d466b04800a42df4310ef0c72552d8d6b13a..ed273ec96cd071a6a9da32d49ffa744e570703dd 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.h
@@ -1,6 +1,13 @@
 #ifndef PointMeasureTreeModel_H
 #define PointMeasureTreeModel_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // parent
 #include "AbstractTreeModel.h"
@@ -19,7 +26,7 @@ namespace Isis {
   class PointParentItem;
   class RootItem;
   class TreeView;
-  
+
 
   /**
    * @brief Tree model for control points and control measures
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp
index a239508df9ef47ff745e37a2e290dbe20468f48c..1c91057c1ac57a6e8805f536b2a42cd7398e3508 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointParentItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.h b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.h
index 888cc710a313953d1e30c532cc15d06b921b2b35..fa647c8b9f7094ebc413ab609817b7946e512635 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.h
@@ -1,6 +1,14 @@
 #ifndef PointParentItem_H
 #define PointParentItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "AbstractParentItem.h"
 #include "AbstractPointItem.h"
@@ -20,8 +28,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class PointParentItem : public AbstractPointItem, public AbstractParentItem {
     public:
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp
index b97bce9566766c3c74c56dd50571e16430bf56c9..8d3d102e3822440899d5522548e07073cf51a78f 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointTableDelegate.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.h b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.h
index 06e40edde9e1374ba72cd6fca9be57c7fc771156..2dc3f457ba25ece705a80afcea31690beab013e1 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.h
@@ -1,6 +1,14 @@
 #ifndef PointTableDelegate_H
 #define PointTableDelegate_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractTableDelegate.h"
 
 class QString;
@@ -49,4 +57,3 @@ namespace Isis {
 }
 
 #endif
-
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp
index 6163deefa2c2d8db82a18acabb82d585cdf72e77..fd509cd47746e7b946c63bd40f88523774892ca4 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointTableModel.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.h b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.h
index c222bf15af0fdf33b67423838686e33ff671e3f0..be97e442d56414f816ed32e41a4ac79adda7c6f4 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.h
@@ -1,6 +1,13 @@
 #ifndef PointTableModel_H
 #define PointTableModel_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractTableModel.h"
 
@@ -26,8 +33,8 @@ namespace Isis {
    *
    * @author ????-??-?? Eric Hyer
    *
-   * @internal 
-   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. 
+   * @internal
+   *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
    */
   class PointTableModel : public AbstractTableModel {
       Q_OBJECT
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp
index dddae5720179f83bde691b7327eac00a2eef828d..3cbeeda21304ca4d41120e82aea2ed6d5e161355 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "PointTypeFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.h
index 5caf3f358f6375509a35ca2e22068f3447c5f1d6..25c826d92fc943e9be5f3fd396032de94d4d4103 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.h
@@ -1,6 +1,14 @@
 #ifndef PointTypeFilter_H
 #define PointTypeFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractMultipleChoiceFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp
index ac650360d5662bb5e8b848ee340b4051e72eba30..def7cbf6a0b223e41c1ab7bdb6a98f9d63c1da17 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ResidualMagnitudeFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.h
index b17afc53b2b1bf349336bd010b7dbd57a666cc8f..4ed423fd270030a806eb9b453b2b11dad26365c7 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.h
@@ -1,6 +1,14 @@
 #ifndef ResidualMagnitudeFilter_H
 #define ResidualMagnitudeFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp
index 75115de16c3417c19f9c3dc1202439d488a32fde..0dc65c210f4e0e81846d5217b5e5b86df51c7206 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "RootItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/RootItem.h b/isis/src/qisis/objs/CnetEditorWidget/RootItem.h
index 9725f0e8b9ddecf65c91a0341886cdc146e36246..b09ef337e145ab3ef538e00f266a542777b02df6 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/RootItem.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/RootItem.h
@@ -1,6 +1,13 @@
 #ifndef RootItem_H
 #define RootItem_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractNullDataItem.h"
 #include "AbstractParentItem.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp
index 69cb67e8c31356478bb44f4a77ddac2f9f30b810..ea6f79975ce2c1778b75e193bfaabbb67139c340 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "SampleFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.h b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.h
index 8aa1cfa20631bcd2def3bcd026740c93226f9a43..dacccf514b8d4dffb4e9e43e186a5fd5e29c56f3 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.h
@@ -1,6 +1,14 @@
 #ifndef SampleFilter_H
 #define SampleFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp
index ddffe0302af70df08ab579a6adbf02b897230eac..77a1a59c83fc5457c85e82ed726eeb329298b1ce 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "SampleResidualFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.h b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.h
index 6e1cf569d300e25f591d411813ae02e4e6cc995a..a0b35ce3b8571d6d4419da4c0a4f46e4b32fdfa5 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.h
@@ -1,6 +1,14 @@
 #ifndef SampleResidualFilter_H
 #define SampleResidualFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp
index 985303632d14c5f93d5ad4d0cd1f7cce8c21c4c7..5f8e796b343658c3a53c03c3fc008bfa5deb0b4e 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "SampleShiftFilter.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.h b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.h
index 488096179ae6498cc124d0e5f7e5641b2519e83a..8f5290fb8c9cb9aad4dd324b8e8e8a9f31c55121 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.h
@@ -1,6 +1,14 @@
 #ifndef SampleShiftFilter_H
 #define SampleShiftFilter_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "AbstractNumberFilter.h"
 
 template< typename U, typename V > struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableColumn.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableColumn.cpp
index b9461dcfc9d0773b0ecc9f1e537f614758752248..51d07fb071333439de759beb902cab51e1df5cb0 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableColumn.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableColumn.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "TableColumn.h"
 
 #include <algorithm>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableColumn.h b/isis/src/qisis/objs/CnetEditorWidget/TableColumn.h
index f7e1a454c981e22ea32b95c752dfc33b6695b947..6b0796ca3090b08e6223a535d8d8c4beadda41d6 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableColumn.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableColumn.h
@@ -1,6 +1,14 @@
 #ifndef TableColumn_H
 #define TableColumn_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QObject>
 
 class QString;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp
index b9aa1f565ef19bf54aea02ead915d1896c509ef6..5a7472f73d4557ded48948cabac9aea398e4bd96 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "TableColumnList.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.h b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.h
index d561eca5740e0065b403b83871fa7931b582376a..454dcd024b519086a547974a78f2d343aa735267 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.h
@@ -1,6 +1,14 @@
 #ifndef TableColumnList_H
 #define TableColumnList_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QObject>
 
 template<typename A, typename B> struct QPair;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp
index 329f507a73fc569c9de301d700c45094a4881fa0..efb5279c405b819421c0181c2b9948edd5af1bcf 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "TableView.h"
@@ -17,10 +25,10 @@
 #include "TableColumnList.h"
 
 
-namespace Isis {  
+namespace Isis {
   /**
     * Constructor
-    * 
+    *
     * @param someModel The abstract table model to view
     * @param pathForSettings The path to read/write settings to
     * @param objName The name of the object
@@ -150,7 +158,7 @@ namespace Isis {
 
   /**
     * Returns the horizontal header
-    * 
+    *
     * @return TableViewHeader The horizontal header
     */
   TableViewHeader *TableView::getHorizontalHeader() {
@@ -160,7 +168,7 @@ namespace Isis {
 
   /**
     * Sets the specified column visible or invisible
-    * 
+    *
     * @param column The column to change the visibility of
     * @param visible The visibility setting
     */
@@ -175,17 +183,17 @@ namespace Isis {
 
   /**
     * Returns the model
-    * 
+    *
     * @return AbstractTableModel The model
     */
   AbstractTableModel *TableView::getModel() {
     return m_content->getModel();
   }
-  
-  
+
+
   /**
     * Returns the content of the table
-    * 
+    *
     * @return TableViewContent The content of the table
     */
   TableViewContent *TableView::content() {
@@ -239,11 +247,11 @@ namespace Isis {
   //       m_header->update();
   //     }
   //   }
-  
+
 
   /**
     * Displays warnings for a table
-    * 
+    *
     * @param warning The waarning that will be displayed
     */
   void TableView::displayWarning(AbstractTableModel::Warning warning) {
@@ -285,7 +293,7 @@ namespace Isis {
 
   /**
     * Sets all member variables to NULL
-    */ 
+    */
   void TableView::nullify() {
     m_header = NULL;
     m_content = NULL;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableView.h b/isis/src/qisis/objs/CnetEditorWidget/TableView.h
index d1e23cd4898afe33ce3e70f45ca3939553a37f7e..a050614ad9c6ccddb890399cad9ee60d7c6f4df3 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableView.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableView.h
@@ -1,6 +1,14 @@
 #ifndef TableView_H
 #define TableView_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QWidget>
 
 #include "AbstractTableModel.h"
@@ -28,8 +36,8 @@ namespace Isis {
     *                           also passed.  This was added for IPCE, for the interaction with
     *                           other views.
     *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
-    *   @history 2017-08-08 Makayla Shepherd - Fixed a seg fault in ipce that occurs when 
-    *                           attempting to edit a control point when there is not an active 
+    *   @history 2017-08-08 Makayla Shepherd - Fixed a seg fault in ipce that occurs when
+    *                           attempting to edit a control point when there is not an active
     *                           control network. Fixes #5048.
     */
   class TableView : public QWidget {
@@ -71,14 +79,14 @@ namespace Isis {
 
       void editControlPoint(ControlPoint *, QString);
 
-    private: 
+    private:
       // disable copying and assigning of this class
       TableView(const TableView &);
       TableView &operator=(const TableView &other);
-      
+
       // methods
       void nullify();
-      
+
       // data
       TableViewHeader *m_header;      //!< The table header
       TableViewContent *m_content;    //!< The content of the header
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp
index 425c1d5bdd8c89bc4edd0c657a0f2298dc7b1eb4..c0a72043ab10ac6d4f1606c2fbda06d6d4187b28 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "TableViewContent.h"
@@ -37,7 +45,7 @@
 namespace Isis {
   /**
     * Constructor
-    * 
+    *
     * @param someModel The abstract table model
     */
   TableViewContent::TableViewContent(AbstractTableModel *someModel) {
@@ -89,7 +97,7 @@ namespace Isis {
     setContextMenuPolicy(Qt::CustomContextMenu);
     connect(this, SIGNAL(customContextMenuRequested(QPoint)),
         this, SLOT(showContextMenu(QPoint)));
-    
+
     m_activeControlNet = false;
   }
 
@@ -131,7 +139,7 @@ namespace Isis {
 
   /**
     * Returns the minimum size hint
-    * 
+    *
     * @return QSize Minimum size hint
     */
   QSize TableViewContent::minimumSizeHint() const {
@@ -141,9 +149,9 @@ namespace Isis {
 
   /**
     * Returns the minimum size hint
-    * 
+    *
     * @see TableViewContent::minimumSizeHint()
-    * 
+    *
     * @return QSize Minimum size hint
     */
   QSize TableViewContent::sizeHint() const {
@@ -153,7 +161,7 @@ namespace Isis {
 
   /**
     * Returns the model
-    * 
+    *
     * @return AbstractTableModel The model of the table
     */
   AbstractTableModel *TableViewContent::getModel() {
@@ -199,16 +207,16 @@ namespace Isis {
   //     refresh();
   //   }
 
-  
+
   /**
     * Sets if there is an active control net
-    * 
+    *
     * @param bool The bool if there is an active control net
     */
   void TableViewContent::setActiveControlNet(bool activeNet) {
     m_activeControlNet = activeNet;
   }
-  
+
 
   /**
     * Refreshes the table and viewport
@@ -237,7 +245,7 @@ namespace Isis {
 
   /**
     * Updates the horizontal scroll bar
-    * 
+    *
     * @param scrollRight True if the horizontal scroll bar has scrolled right
     */
   void TableViewContent::updateHorizontalScrollBar(bool scrollRight) {
@@ -259,8 +267,8 @@ namespace Isis {
 
 
   /**
-    * Scrolls to the selected items 
-    * 
+    * Scrolls to the selected items
+    *
     * @param newlySelectedItems Newly selected items to scroll to
     */
   void TableViewContent::scrollTo(
@@ -272,7 +280,7 @@ namespace Isis {
 
   /**
     * Scrolls to the selected item
-    * 
+    *
     * @param newlySelectedItem Newly selected item to scroll to
     */
   void TableViewContent::scrollTo(AbstractTreeItem *newlySelectedItem) {
@@ -298,10 +306,10 @@ namespace Isis {
 
   /**
     * Overrides QObject::eventFilter
-    * 
-    * @param target The object that was changed 
+    *
+    * @param target The object that was changed
     * @param event The event that was triggered
-    * 
+    *
     * @return bool True if the event is filtered out
     */
   bool TableViewContent::eventFilter(QObject *target, QEvent *event) {
@@ -310,8 +318,8 @@ namespace Isis {
 
 
   /**
-    * Overrides QWidget::mouseDoubleClickEvent. 
-    * 
+    * Overrides QWidget::mouseDoubleClickEvent.
+    *
     * @param event QMouseEvent
     */
   void TableViewContent::mouseDoubleClickEvent(QMouseEvent *event) {
@@ -338,7 +346,7 @@ namespace Isis {
 
   /**
     * Overrides QWidget::mousePressEvent.
-    * 
+    *
     * @param event QMouseEvent
     */
   void TableViewContent::mousePressEvent(QMouseEvent *event) {
@@ -464,7 +472,7 @@ namespace Isis {
 
   /**
     * Overrides QWidget::mouseReleaseEvent. Empty function
-    * 
+    *
     * @param event QMouseEvent
     */
   void TableViewContent::mouseReleaseEvent(QMouseEvent *event) {
@@ -473,7 +481,7 @@ namespace Isis {
 
   /**
     * Overrides QWidget::mouseMoveEvent.
-    * 
+    *
     * @param event QMouseEvent
     */
   void TableViewContent::mouseMoveEvent(QMouseEvent *event) {
@@ -539,7 +547,7 @@ namespace Isis {
 
   /**
     * Overrides QWidget::leaveEvent
-    * 
+    *
     * @param event QMouseEvent
     */
   void TableViewContent::leaveEvent(QEvent *event) {
@@ -549,7 +557,7 @@ namespace Isis {
 
   /**
     * Overrides QWidget::keyPressEvent
-    * 
+    *
     * @param event QMouseEvent
     */
   void TableViewContent::keyPressEvent(QKeyEvent *event) {
@@ -848,7 +856,7 @@ namespace Isis {
 
   /**
     * Paints the table when there is a paint event. Overrides QWidget::paintEvent
-    * 
+    *
     * @param event The paint event
     */
   void TableViewContent::paintEvent(QPaintEvent *event) {
@@ -970,8 +978,8 @@ namespace Isis {
 
 
   /**
-    * Updates the table when it is resized. 
-    * 
+    * Updates the table when it is resized.
+    *
     * @param event Resize event
     */
   void TableViewContent::resizeEvent(QResizeEvent *event) {
@@ -983,7 +991,7 @@ namespace Isis {
 
   /**
     * Updates the item list when the user scrolls
-    * 
+    *
     * @param dx X scroll
     * @param dy Y scroll
     */
@@ -1016,7 +1024,7 @@ namespace Isis {
 
   /**
     * Rebuilds the models when the data is changed
-    * 
+    *
     * @param col The table column that changed
     */
   void TableViewContent::cellDataChanged(const TableColumn *col) {
@@ -1048,7 +1056,7 @@ namespace Isis {
 
   /**
     * Copies the selected cells
-    * 
+    *
     * @param allCells Determines if all of the visible rows should be copied
     */
   void TableViewContent::copyCellSelection(bool allCells) {
@@ -1135,8 +1143,8 @@ namespace Isis {
   /**
     * Calculates the visible range of a column and returns the index of the column
     *
-    * @param screenX X value of the screen size 
-    * 
+    * @param screenX X value of the screen size
+    *
     * @return int Column that fits the screen, or if there aren't any columns that fit -1
     */
   int TableViewContent::getColumnFromScreenX(int screenX) const {
@@ -1158,8 +1166,8 @@ namespace Isis {
   /**
     * Calculates the visible range of a row and returns the index of the column
     *
-    * @param screenY Y value of the screen size 
-    * 
+    * @param screenY Y value of the screen size
+    *
     * @return int Row that fits the screen, or if there aren't any columns that fit -1
     */
   int TableViewContent::getRowFromScreenY(int screenY) const {
@@ -1175,7 +1183,7 @@ namespace Isis {
 
   /**
     * Checks if there is an active cell
-    * 
+    *
     * @return bool True if there is an active cell
     */
   bool TableViewContent::hasActiveCell() const {
@@ -1185,7 +1193,7 @@ namespace Isis {
 
   /**
     * Checks if there is a row selected
-    * 
+    *
     * @return bool True if there is a row selected
     */
   bool TableViewContent::hasRowSelection() const {
@@ -1195,9 +1203,9 @@ namespace Isis {
 
   /**
     * Checks if the mouse is in the selected cells
-    * 
+    *
     * @param mousePos Mouse position
-    * 
+    *
     * @return bool True if the mouse is in the selected cells
     */
   bool TableViewContent::mouseInCellSelection(QPoint mousePos) const {
@@ -1211,9 +1219,9 @@ namespace Isis {
 
   /**
     * Checks if the mouse is in the selected row
-    * 
+    *
     * @param mousePos Mouse position
-    * 
+    *
     * @return bool True if the mouse is in the selected row
     */
   bool TableViewContent::mouseInRowSelection(QPoint mousePos) const {
@@ -1225,9 +1233,9 @@ namespace Isis {
 
   /**
     * Checks if the row number is valid
-    * 
+    *
     * @param rowNum Row to check
-    * 
+    *
     * @return bool True if the row is greater or equal to 0 and less than m_items->size()
     */
   bool TableViewContent::rowIsValid(int rowNum) const {
@@ -1242,9 +1250,9 @@ namespace Isis {
 
   /**
     * Checks if the column number is valid
-    * 
+    *
     * @param colNum Column to check
-    * 
+    *
     * @return bool True if the column is greater or equal to 0 and less than m_items->size()
     */
   bool TableViewContent::columnIsValid(int colNum) const {
@@ -1259,10 +1267,10 @@ namespace Isis {
 
   /**
     * Checks if the cell is editable
-    * 
+    *
     * @param rowNum The cell's row
     * @param colNum The cell's column
-    * 
+    *
     * @return bool True if the cell is selectable and editable
     */
   bool TableViewContent::cellIsEditable(int rowNum, int colNum) const {
@@ -1283,9 +1291,9 @@ namespace Isis {
 
   /**
     * Checks if the column has a non empty title
-    * 
+    *
     * @param colNum The column to check
-    * 
+    *
     * @return bool True if the column has a non-empty title
     */
   bool TableViewContent::isDataColumn(int colNum) const {
@@ -1296,11 +1304,11 @@ namespace Isis {
 
   /**
     * Repaints the row
-    * 
+    *
     * @param painter The QPainter
     * @param rowNum The row to repaint
     * @param absolutePosition The row position
-    * @param relativePosition The row position in the visible area 
+    * @param relativePosition The row position in the visible area
     */
   void TableViewContent::paintRow(QPainter *painter, int rowNum,
       QPoint absolutePosition, QPoint relativePosition) {
@@ -1446,7 +1454,7 @@ namespace Isis {
 
   /**
     * Updates which cell is active
-    * 
+    *
     * @param screenPos The position of the active cell
     */
   void TableViewContent::updateActiveCell(QPoint screenPos) {
@@ -1499,7 +1507,7 @@ namespace Isis {
 
   /**
     * Updates which column is selected
-    * 
+    *
     * @param item The new selected group
     */
   void TableViewContent::updateColumnGroupSelection(AbstractTreeItem *item) {
@@ -1527,9 +1535,9 @@ namespace Isis {
 
   /**
     * Updates which row is selected
-    * 
+    *
     * @param lastRow The index of the last row
-    * 
+    *
     * @return QList< AbstractTreeItem * > The newly selected row
     */
   QList< AbstractTreeItem * > TableViewContent::updateRowGroupSelection(int lastRow) {
@@ -1568,7 +1576,7 @@ namespace Isis {
 
   /**
     * Copies selected cells
-    * 
+    *
     * @see copyCellSelection
     */
   void TableViewContent::copySelection() {
@@ -1578,7 +1586,7 @@ namespace Isis {
 
   /**
     * Copies all of the cells
-    * 
+    *
     * @see copyCellSelection
     */
   void TableViewContent::copyAll() {
@@ -1663,7 +1671,7 @@ namespace Isis {
 
   /**
     * Populates the context menus based on where the user clicked
-    * 
+    *
     * @param mouseLocation Location of the mouse
     */
   void TableViewContent::showContextMenu(QPoint mouseLocation) {
@@ -1673,11 +1681,11 @@ namespace Isis {
     // TODO: 2017-05-17 TLS
     // Always allow editing of point.  Should we check for editLock??
     QList<AbstractTreeItem *> selectedRows = m_model->getSelectedItems();
-    
+
 
     // If there is a row selection, show a context menu if the user clicked
     // anywhere on any of the selected row(s).
-    
+
     if (QApplication::applicationName() != "cneteditor") {
       if (m_activeControlNet) {
         m_editControlPointAct->setEnabled(true);
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h
index f30cc3b5535889a94c0a978d9e43c5348d2ec973..eaf3a67768c7a1719f3ba93c30dc71c01f3d6509 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h
@@ -1,6 +1,14 @@
 #ifndef TableViewContent_H
 #define TableViewContent_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QAbstractScrollArea>
 
 #include <QPoint>
@@ -39,15 +47,15 @@ namespace Isis {
     *   @history 2017-07-18 Christopher Combs - Fixed bug in which trying to edit a selected row
     *                           would cause a segfault from m_activeCell being null. Fixes #4958.
     *   @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054.
-    *   @history 2017-08-08 Makayla Shepherd - Fixed a seg fault in ipce that occurs when 
-    *                           attempting to edit a control point when there is not an active 
+    *   @history 2017-08-08 Makayla Shepherd - Fixed a seg fault in ipce that occurs when
+    *                           attempting to edit a control point when there is not an active
     *                           control network. Fixes #5048.
     *   @history 2017-09-20 Ian Humphrey - Modified showContextMenu so single line if statements
     *                           have braces. This prevents a misleading-indentation warning from
     *                           occuring during Fedora25 (c++14) builds. No functionality has been
     *                           changed. References #4809.
-    *   @history 2018-07-17 Kaitlyn Lee - Modified showContextMenu() to enable 
-                                m_deleteSelectedRowsAct regardless if an active control is set. 
+    *   @history 2018-07-17 Kaitlyn Lee - Modified showContextMenu() to enable
+                                m_deleteSelectedRowsAct regardless if an active control is set.
     */
   class TableViewContent : public QAbstractScrollArea {
       Q_OBJECT
@@ -184,7 +192,7 @@ namespace Isis {
       * This action edits selected control point or if measure selected, edit parent control pt
       */
       QAction *m_editControlPointAct;
-      
+
       bool m_activeControlNet;
 
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp
index 8cf1f11b03720322f85448d42daf15458e629ab0..0bae681b541e64812baa3dbf61ea4f64cf86a4af 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "TableViewHeader.h"
@@ -27,7 +35,7 @@
 namespace Isis {
   /**
     * Constructor
-    * 
+    *
     * @param someModel The table model
     */
   TableViewHeader::TableViewHeader(AbstractTableModel *someModel) {
@@ -68,7 +76,7 @@ namespace Isis {
 
   /**
     * Sets the column list
-    * 
+    *
     * @param cols The column list
     */
   void TableViewHeader::setColumns(TableColumnList *cols) {
@@ -78,7 +86,7 @@ namespace Isis {
 
   /**
     * Returns the minimum size based on the font
-    * 
+    *
     * @return QSize Minimum size allowed
     */
   QSize TableViewHeader::minimumSizeHint() const {
@@ -90,9 +98,9 @@ namespace Isis {
 
   /**
     * Returns the minimum size based on the font
-    * 
+    *
     * @see minimumSizeHint
-    * 
+    *
     * @return QSize Minimum size allowed
     */
   QSize TableViewHeader::sizeHint() const {
@@ -102,7 +110,7 @@ namespace Isis {
 
   /**
     * Connects the table model to the functions that handle changes
-    * 
+    *
     * @param someModel The table model to connect
     */
   void TableViewHeader::setModel(AbstractTableModel *someModel) {
@@ -164,7 +172,7 @@ namespace Isis {
 
   /**
     * Updates the visible columns, and geometry when the filter count changes
-    * 
+    *
     * @param visibleTopLevelItemCount Number of visible top level items
     * @param topLevelItemCount Number of top level items
     */
@@ -190,8 +198,8 @@ namespace Isis {
 
 
   /**
-    * Updates the header offset 
-    * 
+    * Updates the header offset
+    *
     * @param newOffset The new header offset
     */
   void TableViewHeader::updateHeaderOffset(int newOffset) {
@@ -202,7 +210,7 @@ namespace Isis {
 
   /**
     * Overrides QWidget::mousePressEvent
-    * 
+    *
     * @param event The mouse press event
     */
   void TableViewHeader::mousePressEvent(QMouseEvent *event) {
@@ -235,7 +243,7 @@ namespace Isis {
 
   /**
     * Overrides QWidget::mouseMoveEvent
-    * 
+    *
     * @param event The mouse move event
     */
   void TableViewHeader::mouseMoveEvent(QMouseEvent *event) {
@@ -271,7 +279,7 @@ namespace Isis {
 
   /**
     * Overrides QWidget::mouseReleaseEvent
-    * 
+    *
     * @param event The mouse release event
     */
   void TableViewHeader::mouseReleaseEvent(QMouseEvent *event) {
@@ -311,7 +319,7 @@ namespace Isis {
 
   /**
     * Repaints the header
-    * 
+    *
     * @param event The paint event
     */
   void TableViewHeader::paintEvent(QPaintEvent *event) {
@@ -340,9 +348,9 @@ namespace Isis {
 
   /**
     * Returns the visible column rectangle
-    * 
+    *
     * @param column Column to check
-    * 
+    *
     * @return QRect The visible column rectangle
     */
   QRect TableViewHeader::getColumnRect(int column) const {
@@ -366,9 +374,9 @@ namespace Isis {
 
   /**
     * Returns the column under the mouse
-    * 
+    *
     * @param mousePos The mouse position
-    * 
+    *
     * @return int Index of the column under the mouse
     */
   int  TableViewHeader::getMousedColumn(QPoint mousePos) {
@@ -388,9 +396,9 @@ namespace Isis {
 
   /**
     * Returns the edge of the column under the mouse
-    * 
+    *
     * @param mousePos The mouse position
-    * 
+    *
     * @return int Index of the column edge under the mouse
     */
   int TableViewHeader::getMousedColumnEdge(QPoint mousePos) {
@@ -415,9 +423,9 @@ namespace Isis {
 
   /**
     * Returns if the mouse is at the edge of a resizeable column
-    * 
+    *
     * @param mousePos The mouse position
-    * 
+    *
     * @return bool True if the mouse is at the edge fo a resizable column
     */
   bool TableViewHeader::mouseAtResizableColumnEdge(QPoint mousePos) {
@@ -449,7 +457,7 @@ namespace Isis {
 
   /**
     * Repaints the header
-    * 
+    *
     * @param painter The QPainter
     * @param rowHeight The new row height
     */
@@ -588,7 +596,7 @@ namespace Isis {
 
   /**
     * Updates the progress bar
-    * 
+    *
     * @param painter The QPainter
     * @param rect The progress bar
     * @param min The minimum progress value
@@ -616,7 +624,7 @@ namespace Isis {
 
   /**
     * Updates the current filter progress value
-    * 
+    *
     * @param newProgress New progress value
     */
   void TableViewHeader::updateFilterProgress(int newProgress) {
@@ -627,7 +635,7 @@ namespace Isis {
 
   /**
     * Updates the range of the filter progress
-    * 
+    *
     * @param min The minimum progress
     * @param max The maximum progress
     */
@@ -640,7 +648,7 @@ namespace Isis {
 
   /**
     * Updates the current rebuild progress value
-    * 
+    *
     * @param newProgress New progress value
     */
   void TableViewHeader::updateRebuildProgress(int newProgress) {
@@ -651,7 +659,7 @@ namespace Isis {
 
   /**
     * Updates the range of the rebuild progress
-    * 
+    *
     * @param min The minimum progress
     * @param max The maximum progress
     */
@@ -664,7 +672,7 @@ namespace Isis {
 
   /**
     * Updates the current sort progress value
-    * 
+    *
     * @param newProgress New progress value
     */
   void TableViewHeader::updateSortProgress(int newProgress) {
@@ -675,7 +683,7 @@ namespace Isis {
 
   /**
     * Updates the range of the sort progress
-    * 
+    *
     * @param min The minimum progress
     * @param max The maximum progress
     */
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.h b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.h
index a5668cbb8e64954a2422b569ac4dc611535f0443..419ddc1fd7e9bf3ead948507ce3c046f32376b51 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.h
@@ -1,6 +1,14 @@
 #ifndef TableViewHeader_H
 #define TableViewHeader_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QWidget>
 
 class QMouseEvent;
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp b/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp
index 540df1b47767a9595cc605162588b8eb0a2f128e..996d0f52567091421eb32de1599eac2c20c96abc 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "TreeView.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeView.h b/isis/src/qisis/objs/CnetEditorWidget/TreeView.h
index bd571c72a2b3627df829479403ef0d2ffa774c3e..eb9b3a0beb2e2271ca76df1874afd04a42e47c21 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TreeView.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/TreeView.h
@@ -1,6 +1,14 @@
 #ifndef TreeView_H
 #define TreeView_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QWidget>
 
 
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp
index df1e6f7787184b0fe599c72506520a2d8834b5a1..7d9186682435bd68f98cfa26e38f6c0b235704f8 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "TreeViewContent.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.h b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.h
index 363cddf5bcfcbbf69c9881eaf5697ce7b3a82950..868746595a9551db2c4aebd13f59f2962c2f2c74 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.h
@@ -1,6 +1,13 @@
 #ifndef TreeViewContent_H
 #define TreeViewContent_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // parent
 #include <QAbstractScrollArea>
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp
index 1c73edbf9e6b22d6daa1ae56364228c8b5e5c1a3..574b7f3065cd81db9547c41100b99d8720be1747 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp
+++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "TreeViewHeader.h"
diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.h b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.h
index c7ee8ed79ae79d956454466b38a8845479186cbe..8fa76ceb98b3fc828f52a59d8ada27e049c8370e 100644
--- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.h
+++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.h
@@ -1,6 +1,14 @@
 #ifndef TreeViewHeader_H
 #define TreeViewHeader_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QWidget>
 
 class QMouseEvent;
diff --git a/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.cpp b/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.cpp
index e55ed1c401f869cdf117f327102b46e9198bca1a..bf13194ecc78e774a7f8de273945633e54119ff5 100644
--- a/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.cpp
+++ b/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.cpp
@@ -1,25 +1,10 @@
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2009/07/15 17:33:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "ConcurrentControlNetReader.h"
 
@@ -53,9 +38,9 @@ namespace Isis {
    */
   ConcurrentControlNetReader::ConcurrentControlNetReader() {
     nullify();
-    
+
     m_mappedRunning = false;
-    
+
     m_progressBar = new ProgressBar("Reading Control Nets");
     m_watcher = new QFutureWatcher<Control *>;
 
@@ -92,13 +77,13 @@ namespace Isis {
    * @param filename The filename of the network to read
    */
   void ConcurrentControlNetReader::read(QString filename) {
-        
+
     m_backlog.append(filename);
-    
+
     if (!m_progressBar.isNull()) {
       m_progressBar->setRange(0, m_progressBar->maximum() + 1);
     }
-    
+
     start();
   }
 
@@ -109,11 +94,11 @@ namespace Isis {
   void ConcurrentControlNetReader::read(QStringList filenames) {
 
     m_backlog.append(filenames);
-    
+
     if (!m_progressBar.isNull()) {
       m_progressBar->setRange(0, m_progressBar->maximum() + filenames.size());
     }
-    
+
     start();
   }
 
@@ -136,7 +121,7 @@ namespace Isis {
 
 
   void ConcurrentControlNetReader::start() {
-        
+
     if (!m_backlog.isEmpty() && !m_mappedRunning) {
 
       QList< QPair<FileName, Progress *> > functorInput;
@@ -147,27 +132,27 @@ namespace Isis {
 
         functorInput.append(qMakePair(FileName(backlogFileName), progress));
       }
-      
+
       QFuture<Control *> networks = QtConcurrent::mapped(functorInput,
                                     FileNameToControlFunctor(QThread::currentThread()));
-            
+
       try {
         networks.result();
       }
       catch (IException &e) {
         throw e;
       }
-      
+
       if (!m_progressBar.isNull()) {
         m_progressBar->setVisible(true);
       }
-      
+
       delete m_progressUpdateTimer;
-      
+
       m_watcher->setFuture(networks);
       m_mappedRunning = true;
       m_backlog.clear();
-      
+
       m_progressUpdateTimer = new QTimer;
       connect(m_progressUpdateTimer, SIGNAL(timeout()),
               this, SLOT(updateProgressValue()));
@@ -175,7 +160,7 @@ namespace Isis {
     }
   }
 
-  
+
   void ConcurrentControlNetReader::updateProgressValue() {
     if (!m_mappedRunning) {
       foreach (Progress *progress, m_progress) {
@@ -273,4 +258,3 @@ namespace Isis {
     return *this;
   }
 }
-
diff --git a/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.h b/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.h
index 74d6574bd3c42aac47aaf2095f9499324302392f..7e64eeb53ede36539c47e5dd962982ec2a8f9d42 100644
--- a/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.h
+++ b/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.h
@@ -1,27 +1,13 @@
 #ifndef ConcurrentControlNetReader_h
 #define ConcurrentControlNetReader_h
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2009/07/15 17:33:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QObject>
 #include <QPair>
diff --git a/isis/src/qisis/objs/Control/Control.cpp b/isis/src/qisis/objs/Control/Control.cpp
index 751cc3f83c62614fe951e2f4ec568e9aceafd58e..9380f0ea3ec61e9f861e9f1ceb8b3d3c52dc7a6c 100644
--- a/isis/src/qisis/objs/Control/Control.cpp
+++ b/isis/src/qisis/objs/Control/Control.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Control.h"
 
 #include <QDebug>
@@ -172,13 +180,13 @@ namespace Isis {
 
 
   /**
-   * @description Write control net to disk.  This method is used instead of calling 
-   * ControlNet::Write directly so that Control knows the modification state of the control net. 
+   * @description Write control net to disk.  This method is used instead of calling
+   * ControlNet::Write directly so that Control knows the modification state of the control net.
    * Note that if there is not a control net opened, there should no be any changes to write.
-   *  
-   * @return @b bool Returns false if there is not a control net open to write 
-   *  
-   * @throws IException::Programmer "Cannot write control net to disk" 
+   *
+   * @return @b bool Returns false if there is not a control net open to write
+   *
+   * @throws IException::Programmer "Cannot write control net to disk"
    */
   bool Control::write() {
 
@@ -213,10 +221,10 @@ namespace Isis {
 
 
   /**
-   * @description Has this control been modified? 
-   *  
-   * @return @b bool Has this control been modified? 
-   *  
+   * @description Has this control been modified?
+   *
+   * @return @b bool Has this control been modified?
+   *
    */
   bool Control::isModified() {
     return m_modified;
@@ -224,14 +232,14 @@ namespace Isis {
 
 
   /**
-   * @description Sets the modification state of this control. This is needed for now since many 
-   * classes make changes to the control net contained in this object, but the control does not 
-   * know the state of the control net. 
+   * @description Sets the modification state of this control. This is needed for now since many
+   * classes make changes to the control net contained in this object, but the control does not
+   * know the state of the control net.
    * TODO:  Change this class to always know the state of the control Net.
-   *  
+   *
    */
   void Control::setModified(bool modified) {
-    
+
     m_modified = modified;
   }
 
@@ -286,7 +294,7 @@ namespace Isis {
   void Control::copyToNewProjectRoot(const Project *project, FileName newProjectRoot) {
 
     if (FileName(newProjectRoot).toString() != FileName(project->projectRoot()).toString()) {
-  
+
       QString newNetworkPath =  project->cnetRoot(newProjectRoot.toString()) + "/" +
                   FileName(m_fileName).dir().dirName() + "/" + FileName(m_fileName).name();
 
diff --git a/isis/src/qisis/objs/Control/Control.h b/isis/src/qisis/objs/Control/Control.h
index a3d10118410f9d358adad416c05b92721da7365d..92242f6875016bc2f388a1287e777e182fdef214 100644
--- a/isis/src/qisis/objs/Control/Control.h
+++ b/isis/src/qisis/objs/Control/Control.h
@@ -1,27 +1,14 @@
 #ifndef Control_H
 #define Control_H
-/**
- * @file
- * $Revision: 1.0 $
- * $Date: 2012/06/12 15:55:00 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QObject> // parent
 #include <QString>
 
@@ -97,7 +84,7 @@ namespace Isis {
 
       bool isModified();
       void setModified(bool modified = true);
-      bool write();  
+      bool write();
 
       void save(QXmlStreamWriter &stream, const Project *project, FileName newProjectRoot) const;
       void copyToNewProjectRoot(const Project *project, FileName newProjectRoot);
diff --git a/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.cpp b/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.cpp
index b89deb484092436abef47c1e03f86a08e207095e..a1eafa8befd5bf23b0a67673c6dcae28dbca2fa8 100644
--- a/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.cpp
+++ b/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlDisplayProperties.h"
 
 #include <QAction>
diff --git a/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.h b/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.h
index 7542421271a58b48ef0018d700477a91c5dffa90..cd6005a8a421dfc7796224c634fe4d861832187e 100644
--- a/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.h
+++ b/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.h
@@ -1,27 +1,13 @@
 #ifndef ControlDisplayProperties_H
 #define ControlDisplayProperties_H
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2012/06/12 06:30:00 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QObject>
 #include <QMetaType> // required since we're adding to QVariant
@@ -166,4 +152,3 @@ namespace Isis {
 Q_DECLARE_METATYPE(QList<Isis::ControlDisplayProperties *>);
 
 #endif
-
diff --git a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp
index 83adadf4f2c8fe9ed3691c4c95b0bd7d022b8591..45574052370253b47bff6720cf9e01a1dd5d441d 100644
--- a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp
+++ b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ControlHealthMonitorView.h"
diff --git a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.h b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.h
index 7aa5b8951f7f3d20ecfadb3d17fb0c257295508c..b00e80f7601c53ad37eeae597794ac44d4266f18 100644
--- a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.h
+++ b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.h
@@ -1,27 +1,14 @@
 #ifndef ControlHealthMonitorView_h
 #define ControlHealthMonitorView_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QMap>
 #include <QPointer>
 #include <QToolBar>
diff --git a/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp b/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp
index 4bed4c132bb99bb1968b8d1151560b202c3baa1b..bec695e946ed6293079ac46a3f0204d20f1be0d2 100644
--- a/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp
+++ b/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlHealthMonitorWidget.h"
 
 
diff --git a/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.h b/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.h
index cf0afd10919d762a574839f56c8ef8629c12ab36..bf4f2e2053233ab7b33631ee0f3bb4c5a23b832e 100644
--- a/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.h
+++ b/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.h
@@ -1,27 +1,13 @@
 #ifndef ControlHealthMonitorWidget_h
 #define ControlHealthMonitorWidget_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QLabel>
 #include <QTableWidget>
diff --git a/isis/src/qisis/objs/ControlList/ControlList.cpp b/isis/src/qisis/objs/ControlList/ControlList.cpp
index b2eed5235d5b1bc65529d1e595370e94c20e05b8..8b5dbd3be6fc9aed692d60f68f99e7db78e2e080 100644
--- a/isis/src/qisis/objs/ControlList/ControlList.cpp
+++ b/isis/src/qisis/objs/ControlList/ControlList.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlList.h"
 
 #include <QAction>
@@ -655,7 +641,7 @@ namespace Isis {
 
     // Only copy controls if saving to new location
     if (project->newProjectRoot() != project->projectRoot()) {
-      QFuture<void *> future = QtConcurrent::mapped(*this, 
+      QFuture<void *> future = QtConcurrent::mapped(*this,
                                                     CopyControlDataFunctor(project, newProjectRoot));
       for (int i = 0; i < count(); i++) {
         int newProgressValue = progressDialog.value() + 1;
diff --git a/isis/src/qisis/objs/ControlList/ControlList.h b/isis/src/qisis/objs/ControlList/ControlList.h
index 003ed2464f3803a14c50158d6f9e68ad322fdf88..49f34e6b08d08eae300a565e4faffdee88831494 100644
--- a/isis/src/qisis/objs/ControlList/ControlList.h
+++ b/isis/src/qisis/objs/ControlList/ControlList.h
@@ -1,6 +1,14 @@
 #ifndef ControlList_H
 #define ControlList_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 #include <QList>
 #include <QMetaType>
diff --git a/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp b/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp
index 34e0e404fc3a9f1691b9d730abae3728739e49c8..c9329dfd8cf05c257b6f53e2627e197ac6cd8b3e 100644
--- a/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp
+++ b/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlMeasureEditWidget.h"
 
 #include <QApplication>
@@ -760,8 +768,8 @@ namespace Isis {
    * Set the tack position of the measure in the left ChipViewport
    *
    * @param sample[in]  Sample of the tack position for the right ChipViewport
-   * @param line[in]    Line of the tack position for the left ChipViewport 
-   *  
+   * @param line[in]    Line of the tack position for the left ChipViewport
+   *
    */
   void ControlMeasureEditWidget::setLeftPosition(double sample, double line) {
 
@@ -774,8 +782,8 @@ namespace Isis {
    * Set the tack position of the measure in the right ChipViewport
    *
    * @param sample[in]  Sample of the tack position for the right ChipViewport
-   * @param line[in]    Line of the tack position for the left ChipViewport 
-   *  
+   * @param line[in]    Line of the tack position for the left ChipViewport
+   *
    */
   void ControlMeasureEditWidget::setRightPosition(double sample, double line) {
 
@@ -1726,8 +1734,8 @@ namespace Isis {
    * Set the Control Point for this widget
    *
    * @param editPoint[in]  ControlPoint for this widget
-   * @param snList[in]     SerialNumberList associated with the control net containing the ControlPoint 
-   *  
+   * @param snList[in]     SerialNumberList associated with the control net containing the ControlPoint
+   *
    */
   void ControlMeasureEditWidget::setPoint(ControlPoint *editPoint, SerialNumberList *snList) {
 
@@ -1790,7 +1798,7 @@ namespace Isis {
       else {
         blinkViewport->zoom(m_leftView->zoomFactor());
       }
-      m_blinkChipViewportListRight.append(blinkViewport); 
+      m_blinkChipViewportListRight.append(blinkViewport);
     }
 
     m_blinkIndexRight = 0;
diff --git a/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.h b/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.h
index ab1b0c32b2ba7acd43856f0dcc4f23882c3de867..a7e899dc18b72069e48aedd12abff03a508256e1 100644
--- a/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.h
+++ b/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.h
@@ -1,6 +1,14 @@
 #ifndef ControlMeasureEditWidget_h
 #define ControlMeasureEditWidget_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // This is the only include allowed in this file!
 #include <QWidget>
 
@@ -158,7 +166,7 @@ namespace Isis {
     *                           points.
     *   @history 2018-10-10 Tracie Sucharski - Fixed blink extension to use geom if selected and
     *                           correct zoom factor.
-    *                          
+    *
     *   @todo  Re-think design of the change made on 2012-07-26.  The linking was put into
     *                          ::updateLeftPositionLabel because it was the fastest solution, but
     *                          should this be put somewhere else.
diff --git a/isis/src/qisis/objs/ControlNetTool/ControlNetTool.cpp b/isis/src/qisis/objs/ControlNetTool/ControlNetTool.cpp
index 3c2e25bb00b8dbbc81f75a8e2d947a0ed90f452f..6cee80cda7562e786ea139a627e562f532f5411d 100644
--- a/isis/src/qisis/objs/ControlNetTool/ControlNetTool.cpp
+++ b/isis/src/qisis/objs/ControlNetTool/ControlNetTool.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlNetTool.h"
 
 #include <sstream>
@@ -38,7 +46,7 @@ using namespace std;
 namespace Isis {
   /**
    * ControlNet tool - Handles mouse button actions and drawing control points on viewports in the
-   * CubeDnView for the ipce application. 
+   * CubeDnView for the ipce application.
    *
    * @param parent Pointer to the parent widget for the ControlNet tool
    *
@@ -373,10 +381,10 @@ namespace Isis {
 
   /**
    * Draw all Fixed or Constrained points on the ground source viewport
-   *  
+   *
    * @param vp Viewport whose measurements will be drawn
-   * @param painter The QPainter used to draw crosshair 
-   * @param groundMap The UniversalGroundMap for the Cube associated with this viewport 
+   * @param painter The QPainter used to draw crosshair
+   * @param groundMap The UniversalGroundMap for the Cube associated with this viewport
    *
    */
   void ControlNetTool::drawGroundMeasures(MdiCubeViewport *vp, QPainter *painter,
diff --git a/isis/src/qisis/objs/ControlNetTool/ControlNetTool.h b/isis/src/qisis/objs/ControlNetTool/ControlNetTool.h
index dfa1f4a5aa233bf3ba97cabbe4495c705961e0bd..49abbf404b96abadcfa7e70844aec834a08afcd9 100644
--- a/isis/src/qisis/objs/ControlNetTool/ControlNetTool.h
+++ b/isis/src/qisis/objs/ControlNetTool/ControlNetTool.h
@@ -1,6 +1,14 @@
 #ifndef ControlNetTool_h
 #define ControlNetTool_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Tool.h"
 #include "ControlPoint.h"
 
@@ -29,7 +37,7 @@ namespace Isis {
   class UniversalGroundMap;
 
   /**
-   * @brief ControlNetTool Handles mouse events on CubeDnViews for control point editing for the 
+   * @brief ControlNetTool Handles mouse events on CubeDnViews for control point editing for the
    *        ipce app.
    *
    * @ingroup Visualization Tools
@@ -49,7 +57,7 @@ namespace Isis {
    *   @history 2017-08-02 Tracie Sucharski - Draw the current edit Control Point as a circle with
    *                           center crosshair in red.  Removed refresh method; it was not being
    *                           used.  Fixes #5007, #5008.
-   *   @history 2017-08-08 Cole Neubauer - Renamed from IpceTool.  Fixes #5090. 
+   *   @history 2017-08-08 Cole Neubauer - Renamed from IpceTool.  Fixes #5090.
    *   @history 2017-08-09 Cole Neubauer - Added loadNetwork() for changing inbetween active
    *                           networks Fixes #4567
    *   @history 2018-03-12 Tracie Sucharski - Fixed some documentation leftover from renaming from
diff --git a/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp b/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp
index 1fd315e9e1a759dc896520ae5229336cc0c30f11..c3c3758c1bffd0ec66c9f5333c8f95d7bdce3c3d 100644
--- a/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp
+++ b/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlPointEdit.h"
 
 //TEST
diff --git a/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h b/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h
index 598b58485a04c8ded5a67e20a52e95ae2de2f4d8..5f1957e73e71ca743cfbc8e395c3e1bbe26fbf9a 100644
--- a/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h
+++ b/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h
@@ -1,6 +1,14 @@
 #ifndef ControlPointEdit_h
 #define ControlPointEdit_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // This is the only include allowed in this file!
 #include <QWidget>
 
@@ -130,16 +138,16 @@ namespace Isis {
     *   @history 2013-12-30 Kimberly Oyama and Stuart Sides - In saveChips(), added single quotes
     *                           around the file names in case there are spaces or other special
     *                           characters in them. Fixes #1551.
-    *   @history 2015-01-13 Ian Humphrey - Modified setTemplateFile() so opening a template file 
+    *   @history 2015-01-13 Ian Humphrey - Modified setTemplateFile() so opening a template file
     *                           will undo registration if a point is already registered. Modified
     *                           saveMeasure() to handle exception thrown by
     *                           ControlMeasure::SetLogData(). Fixes #2041.
     *   @history 2015-10-29 Ian Humphrey - Added shortcuts for Register (R), Save Measure (M),
     *                           Undo Registration (U), and Find (F). Fixes #2324.
     *   @history 2017-04-25 Marjorie Hahn - Moved AutoRegFactory creation from the constructor
-    *                           to ControlPointEdit::registerPoint() so that AutoRegFactory is 
+    *                           to ControlPointEdit::registerPoint() so that AutoRegFactory is
     *                           not created until it is needed. Fixes #4590.
-    *  
+    *
     *   @todo  Re-think design of the change made on 2012-07-26.  The linking was put into
     *                          ::updateLeftPositionLabel because it was the fastest solution, but
     *                          should this be put somewhere else.
diff --git a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp
index 15150ef07be6d3d70712baaae96ecb3ff0eddd14..67a9d438d68074198f32598c38d650e041eeb2cc 100644
--- a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp
+++ b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ControlPointEditView.h"
diff --git a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h
index 154bbf1d11d73eab41a80fabe46cc162f0a9a5eb..bc6548bdf8c91630a19fc59c20f426eed27c26c0 100644
--- a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h
+++ b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h
@@ -1,27 +1,14 @@
 #ifndef ControlPointEditView_h
 #define ControlPointEditView_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QMap>
 #include <QPointer>
 #include <QToolBar>
diff --git a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp
index 38b90818a993f0a16dbfa52dce59ef399895d8f0..1945e03d39e9a5225560ef26f9a091a9a9190af6 100644
--- a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp
+++ b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ControlPointEditWidget.h"
@@ -560,14 +568,14 @@ namespace Isis {
 
 
   /**
-   * Fill m_projectShapeNames with ALL shapes currently in project. The first 
+   * Fill m_projectShapeNames with ALL shapes currently in project. The first
    * m_numberProjectShapesWithPoint actually contain the location of m_editPoint.
    *
-   * @param latitude (double) Latitude for determining point location.  Defaults to Null which 
+   * @param latitude (double) Latitude for determining point location.  Defaults to Null which
    *                          results in the m_editPoint location being used, AprioriCoordinates
    *                          if they exist, otherwise the reference measure's location will be
    *                          used.
-   * @param longitude (double) Longitude for determining point location.  Defaults to Null which 
+   * @param longitude (double) Longitude for determining point location.  Defaults to Null which
    *                          results in the m_editPoint location being used, AprioriCoordinates
    *                          if they exist, otherwise the reference measure's location will be
    *                          used.
@@ -831,7 +839,7 @@ namespace Isis {
           success = false;
         }
         else {
-          groundSourceType = m_editPoint->GetAprioriSurfacePointSource(); 
+          groundSourceType = m_editPoint->GetAprioriSurfacePointSource();
           success = true;
         }
       }
@@ -867,12 +875,12 @@ namespace Isis {
 
 
   /**
-   * Ground source file from control net cannot be found, give user option to give new location. 
-   * The option also exists to change for the rest of the ground points in the control net and to 
-   * change the apriori xyz source file in the control net to the new location. 
-   * 
+   * Ground source file from control net cannot be found, give user option to give new location.
+   * The option also exists to change for the rest of the ground points in the control net and to
+   * change the apriori xyz source file in the control net to the new location.
+   *
    * @param groundFile FileName of ground source that has moved location
-   * 
+   *
    * @return FileName Ground source with new location path
    *
    */
@@ -894,7 +902,7 @@ namespace Isis {
 
       //  If can't find ground, re-prompt user for new location. Maybe it's a new ground source.
       if (!newGroundFile.fileExists()) {
-        //  Give options for finding ground source file location. A new location 
+        //  Give options for finding ground source file location. A new location
         //  for new location or new source, either a Shape in the project, or import a new shape,
         //  or simplay choose file?
         QString message = "Ground Source file " + groundFile.expanded();
@@ -946,7 +954,7 @@ namespace Isis {
     for (int i = 0; i < m_controlNet->GetNumPoints(); i++ ) {
       ControlPoint *cp = m_controlNet->GetPoint(i);
       if (cp->HasAprioriSurfacePointSourceFile()) {
-        FileName groundFile(cp->GetAprioriSurfacePointSourceFile()); 
+        FileName groundFile(cp->GetAprioriSurfacePointSourceFile());
         QFileInfo oldFile(groundFile.expanded());
         QFileInfo newFile(m_newGroundDir, oldFile.fileName());
         groundFile = newFile.absoluteFilePath();
@@ -1002,9 +1010,9 @@ namespace Isis {
 
 
   /**
-   * Initialize the given Dem and appropriate member variables for later use editing Fixed or 
-   * Constrained control points. 
-   * 
+   * Initialize the given Dem and appropriate member variables for later use editing Fixed or
+   * Constrained control points.
+   *
    * @param demFile QString The file name of the DEM
    *
    */
@@ -1095,8 +1103,8 @@ namespace Isis {
 
   /**
    * Slot called when user changes selection in m_groundSourceCombo
-   * 
-   * @param index int 
+   *
+   * @param index int
    *
    */
   void ControlPointEditWidget::groundSourceFileSelectionChanged(int index) {
@@ -1129,13 +1137,13 @@ namespace Isis {
       if (m_leftCombo->findText(QFileInfo(m_groundFilename).fileName()) >= 0) {
         m_leftCombo->removeItem(m_leftCombo->findText(QFileInfo(m_groundFilename).fileName()));
         if (m_leftMeasure->GetCubeSerialNumber() == m_groundSN) {
-          selectLeftMeasure(0); 
+          selectLeftMeasure(0);
         }
       }
       if (m_rightCombo->findText(QFileInfo(m_groundFilename).fileName())) {
         m_rightCombo->removeItem(m_rightCombo->findText(QFileInfo(m_groundFilename).fileName()));
         if (m_rightMeasure->GetCubeSerialNumber() == m_groundSN) {
-          selectRightMeasure(0); 
+          selectRightMeasure(0);
         }
       }
       m_pointFiles.removeAll(m_groundFilename);
@@ -1206,7 +1214,7 @@ namespace Isis {
   /**
    * Load point into ControlPointEditWidget.
    *
-   * @param serialNumber (QString) The serial number of cube point was chosen from.  
+   * @param serialNumber (QString) The serial number of cube point was chosen from.
    *
    * @internal
    *   @history 2008-11-26  Jeannie Walldren - Added "Number of Measures" to
@@ -1280,10 +1288,10 @@ namespace Isis {
         aprioriSurfacePointFile = checkGroundFileLocation(aprioriSurfacePointFile);
       }
       if (!aprioriSurfacePointFile.toString().isEmpty()) {
-        m_groundSourceCombo->addItem(aprioriSurfacePointFile.toString()); 
+        m_groundSourceCombo->addItem(aprioriSurfacePointFile.toString());
         m_groundSourceCombo->setCurrentText(aprioriSurfacePointFile.toString());
         m_groundSourceCombo->setItemData(m_groundSourceCombo->currentIndex(),
-                                         QColor(Qt::darkGreen), Qt::ForegroundRole); 
+                                         QColor(Qt::darkGreen), Qt::ForegroundRole);
         m_groundSourceCombo->setItemData(m_groundSourceCombo->currentIndex(),
                                          QFont("DejaVu Sans", 10, QFont::Bold), Qt::FontRole);
       }
@@ -1299,11 +1307,11 @@ namespace Isis {
                                        QFont("DejaVu Sans", 10, QFont::Bold), Qt::FontRole);
     }
     if (m_editPoint->GetType() == ControlPoint::Free) {
-      m_groundSourceCombo->setEnabled(false); 
+      m_groundSourceCombo->setEnabled(false);
       m_radiusSourceCombo->setEnabled(false);
     }
     else {
-      m_groundSourceCombo->setEnabled(true); 
+      m_groundSourceCombo->setEnabled(true);
       m_radiusSourceCombo->setEnabled(true);
     }
     m_groundSourceCombo->blockSignals(false);
@@ -1435,12 +1443,12 @@ namespace Isis {
 
 
   /**
-   * Create a new control point at the given latitude, longitude 
-   *  
+   * Create a new control point at the given latitude, longitude
+   *
    * @param latitude The latitude position for the new control point
    * @param longitude The longitude position for the new control point
-   * @param cube The cube that the user used to select position for new control point 
-   * @param isGroundSource Boolean indicating whether the cube used to choose position is a ground source 
+   * @param cube The cube that the user used to select position for new control point
+   * @param isGroundSource Boolean indicating whether the cube used to choose position is a ground source
    *
    */
 
@@ -1791,9 +1799,9 @@ namespace Isis {
     }
 
     // If this is a fixed or constrained point, and either the left or right measure is the ground
-    // source, update the lat,lon,radius.  
+    // source, update the lat,lon,radius.
     //
-    if (m_editPoint->GetType() != ControlPoint::Free && 
+    if (m_editPoint->GetType() != ControlPoint::Free &&
         (m_leftMeasure->GetCubeSerialNumber() == m_groundSN ||
          m_rightMeasure->GetCubeSerialNumber() == m_groundSN)) {
       // If point is locked and it is not a new point, print error
@@ -2062,7 +2070,7 @@ namespace Isis {
     else {
       Shape *shape = m_nameToShapeMap[m_radiusSourceCombo->currentText()];
       if (shape) {
-        m_radiusFilename = shape->cube()->externalCubeFileName().toString(); 
+        m_radiusFilename = shape->cube()->externalCubeFileName().toString();
         //m_radiusSourceType = shape->radiusSource();
       }
       // Radius source comes from what is already saved in the cnet as AprioriRadiusSourceFile
@@ -2087,11 +2095,11 @@ namespace Isis {
         QString msg = "Could not read radius from DEM, will default to "
           "local radius of reference measure.";
         QMessageBox::warning(this, "Warning", msg);
-        if (m_editPoint->GetRefMeasure()->Camera()->SetGround(Latitude(lat, Angle::Degrees), 
+        if (m_editPoint->GetRefMeasure()->Camera()->SetGround(Latitude(lat, Angle::Degrees),
                                                               Longitude(lon, Angle::Degrees))) {
           radius = m_editPoint->GetRefMeasure()->Camera()->LocalRadius().meters();
           //  TODO  Should this be set here, this is probably not working as intended since it is
-          //         overwritten below outside of if (radius == Null) 
+          //         overwritten below outside of if (radius == Null)
           m_editPoint->SetAprioriRadiusSource(ControlPoint::RadiusSource::None);
         }
         else {
diff --git a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h
index 903cb44aa344026493750874d4c9dec008180af7..21c34b37be1267323495315de5869cab8e00ca7b 100644
--- a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h
+++ b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h
@@ -1,6 +1,14 @@
 #ifndef ControlPointEditWidget_h
 #define ControlPointEditWidget_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "ControlPoint.h"
 #include "FileName.h"
@@ -315,7 +323,7 @@ namespace Isis {
                                       //!  constrained points in the network
       bool m_changeGroundLocationInNet; //!< Change the ground source location
       QString m_newGroundDir; //!< Contains the ground source location
-     
+
       //  TODO:  Combine the following m_groundSourceFile, m_radiusSourceFile
       //           with m_groundFile and m_demFile.  Is it just a matter of
       //           full path vs filename only?
diff --git a/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.cpp b/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.cpp
index c68b8abc582bfe5b6500b0ff81541bde3637bffd..442d2c38349602cb1168dd200d8c75bbbdef02b6 100644
--- a/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.cpp
+++ b/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QtWidgets>
 
 #include "DeleteControlPointDialog.h"
diff --git a/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.h b/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.h
index c896d5ca1926a4a3d7ceed6b0d21c03122b59b4d..cd2860f977e6407f965d97f815b48787c10cd381 100644
--- a/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.h
+++ b/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.h
@@ -1,6 +1,14 @@
 #ifndef DeleteControlPointDialog_h
 #define DeleteControlPointDialog_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDialog>
 
 #include "ui_DeleteControlPointDialog.h"
diff --git a/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.cpp b/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.cpp
index 287285627a893a8b953f7bcd16dff67cb1b34bea..f2f128fafbaaa231d151fd871efc42b118a64678 100644
--- a/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.cpp
+++ b/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "NewGroundSourceLocationDialog.h"
 
 #include <iostream>
@@ -12,10 +20,10 @@ namespace Isis {
 
   /**
    * Dialog to determine new ground source location
-   * 
+   *
    * @param title      - Dialog Title
-   * @param filterList - Dialog Filter list 
-   * @param dir        - Current Directory 
+   * @param filterList - Dialog Filter list
+   * @param dir        - Current Directory
    * @param parent     - Parent widget
    */
   NewGroundSourceLocationDialog::NewGroundSourceLocationDialog(QString title, QString &directory,
@@ -36,14 +44,14 @@ namespace Isis {
 //  hBoxLayout->setAlignment(Qt::AlignLeft);
 //  hBoxLayout->setSpacing(25);
 //  hBoxLayout->setContentsMargins (25, 11, 25, 11 );
-    
+
     // Button Group
 //  QButtonGroup *optionsButtonGroup = new QButtonGroup();
 
     m_changeAllGround = new QCheckBox("Change location of all subsequent ground points loaded",
                                       this);
 //  m_changeAllGround->setWhatsThis("Save the Image As Viewed with Full Resoultion");
-    
+
     m_changeControlNet = new QCheckBox("Change location of ground source in control net."
                                            "  Note:  If above box is checked, all locations will"
                                            " be changed.", this);
@@ -53,7 +61,7 @@ namespace Isis {
 
     vertBoxLayout->addWidget(m_changeAllGround);
     vertBoxLayout->addWidget(m_changeControlNet);
-    
+
     //  Get parent's layout (FileDialog), then add new buttons
     QLayout *dialogLayout = layout();
     dialogLayout->addItem(vertBoxLayout);
@@ -62,22 +70,21 @@ namespace Isis {
 
 
   /**
-   * Indicates whether all subsequent ground source files should be found in new source directory. 
-   * 
+   * Indicates whether all subsequent ground source files should be found in new source directory.
+   *
    */
   bool NewGroundSourceLocationDialog::changeAllGroundSourceLocation() {
 
     return m_changeAllGround->isChecked();
   }
-  
+
 
   /**
    * Indicates whether the control network should be changed to reflect new ground source location.
-   * 
+   *
    */
   bool NewGroundSourceLocationDialog::changeControlNet() {
 
     return m_changeControlNet->isChecked();
   }
 }
-
diff --git a/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.h b/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.h
index 955cf457913f19e6352e6d5ed944cb2ae9c9792a..82317830902a9936edc257b873c9584a4bb55b10 100644
--- a/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.h
+++ b/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.h
@@ -1,24 +1,14 @@
 #ifndef NewGroundSourceLocationDialog_h
 #define NewGroundSourceLocationDialog_h
 
-/**
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
- 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QCheckBox>
 #include <QDir>
@@ -30,8 +20,8 @@
 namespace Isis {
 
   /**
-  * @brief Dialog used by ControlPointEditWidget to select a new location for ground source files. 
-  * Gives option of using new location for all subsequent ground points and whether to update the 
+  * @brief Dialog used by ControlPointEditWidget to select a new location for ground source files.
+  * Gives option of using new location for all subsequent ground points and whether to update the
   * control net to reflect the new location.
   *
   * @ingroup Visualization Tools
@@ -45,11 +35,11 @@ namespace Isis {
       Q_OBJECT
     public:
       NewGroundSourceLocationDialog(QString title, QString &directory, QWidget *parent = 0);
-      
+
 //    QDir newGroundSourceLocation();
       bool changeAllGroundSourceLocation();
       bool changeControlNet();
-      
+
     private:
       QPointer<QCheckBox> m_changeAllGround;   //!< Change location of all subsequent ground control points
       QPointer<QCheckBox> m_changeControlNet;  //!< Change location of ground source in the control network
@@ -57,4 +47,3 @@ namespace Isis {
 };
 
 #endif
-
diff --git a/isis/src/qisis/objs/CubeDnView/CubeDnView.cpp b/isis/src/qisis/objs/CubeDnView/CubeDnView.cpp
index 95a05cfdc2458bd7473a862fd1d472616e301959..ebfbc5a4405743bd064ebc2116450c81af4a88e3 100644
--- a/isis/src/qisis/objs/CubeDnView/CubeDnView.cpp
+++ b/isis/src/qisis/objs/CubeDnView/CubeDnView.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CubeDnView.h"
 
 #include <QAction>
diff --git a/isis/src/qisis/objs/CubeDnView/CubeDnView.h b/isis/src/qisis/objs/CubeDnView/CubeDnView.h
index e8c32d3a1bbec00fc1c0025e88191be01daffefa..94bb32ddaf1667101ca9f24c1f97aafcc18bc206 100644
--- a/isis/src/qisis/objs/CubeDnView/CubeDnView.h
+++ b/isis/src/qisis/objs/CubeDnView/CubeDnView.h
@@ -1,27 +1,13 @@
 #ifndef CubeDnView_h
 #define CubeDnView_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QList>
 #include <QMap>
diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp
index 92c3d5112b6a00f7c23ced0747e46f3a38342871..5d6834447870120a2528f19945cc400873b0f199 100644
--- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp
+++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "CubePlotCurve.h"
@@ -378,11 +386,11 @@ namespace Isis {
 
     size = m_sourceCube.size();
     classData.append((char *)&size, sizeof(int));
-    
+
     for (int i = 0; i < size; i++) {
       int sourceCubeSize = m_sourceCube.at(i).toUtf8().size();
       classData.append((char *)&sourceCubeSize, sizeof(int));
-      classData.append(m_sourceCube.at(i).toUtf8());    
+      classData.append(m_sourceCube.at(i).toUtf8());
     }
 
     size = m_pointList.size();
@@ -470,7 +478,7 @@ namespace Isis {
           deleteThisCurve = true;
         }
       }
-      // handle the configure action dialog 
+      // handle the configure action dialog
       // opens the dialog with only the right-clicked CubePlotCurve
       else if (chosenAct == configureAct) {
         CubePlotCurveConfigureDialog configure(this);
diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.h b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.h
index 41703a466db516aa02c64a9ccf34f1c4bc42c20e..97718d1cfc20b7aa6671746d12a8f5033825eed4 100644
--- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.h
+++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.h
@@ -1,28 +1,13 @@
 #ifndef CubePlotCurve_h
 #define CubePlotCurve_h
 
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2008/06/19 15:54:03 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QObject>
 #include <QPointer>
@@ -62,9 +47,9 @@ namespace Isis {
    *                           necessary. Fixes #688.
    *   @history 2012-03-14 Tracie Sucharski - Added functionality for multiple
    *                           viewports as a source for plots.
-   *   @history 2014-07-02 Ian Humphrey - Added comment for executing configure dialog. 
+   *   @history 2014-07-02 Ian Humphrey - Added comment for executing configure dialog.
    *                           References #2089.
-   */  
+   */
   class CubePlotCurve : public QObject, public PlotCurve {
       Q_OBJECT
 
@@ -106,7 +91,7 @@ namespace Isis {
       void mousePressEvent(QMouseEvent *e);
 
       void clearSource();
-      void addSource(CubeViewport *cvp,  QList<QPoint> screenPoints, 
+      void addSource(CubeViewport *cvp,  QList<QPoint> screenPoints,
                      int band = -1);
 
     private:
@@ -134,4 +119,3 @@ namespace Isis {
 Q_DECLARE_METATYPE(Isis::CubePlotCurve *);
 
 #endif
-
diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.cpp b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.cpp
index 3060955f145f7a737eb79664291b954f1a7fd59d..59b8790b535bfa4eb36a56e2c3ed71791f11341a 100644
--- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.cpp
+++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CubePlotCurveConfigureDialog.h"
 
 #include <iostream>
@@ -24,24 +32,24 @@ namespace Isis {
    */
   CubePlotCurveConfigureDialog::CubePlotCurveConfigureDialog(
       CubePlotCurve *curve, QWidget *parent) : QDialog(parent) {
-    m_plotCurve = curve; 
+    m_plotCurve = curve;
     m_parent = parent;
     // initially set selected curve index to 0 (first curve)
     m_selectedCurve = 0;
-    
+
     // we can grab the CubePlotCurve QList from the parent widget (PlotWindow)
     if (parent) {
       connect( parent, SIGNAL( plotChanged() ),
                this, SLOT( updateCurvesList() ) );
       m_plotCurvesList = qobject_cast<PlotWindow *>(parent)->plotCurves();
-    }    
+    }
     else {
       m_plotCurvesList.append(curve);
     }
 
     QGridLayout *optionsLayout = new QGridLayout;
-    int row = 0; 
-    
+    int row = 0;
+
     // only create a combo box if instantiating this dialog with the configure tool button
     if (parent) {
       QLabel *curvesLabel = new QLabel("Curves: ");
@@ -52,7 +60,7 @@ namespace Isis {
       optionsLayout->addWidget(m_curvesCombo, row, 1);
       row++;
     }
-    
+
     QLabel *nameLabel = new QLabel("Curve Name: ");
     m_nameEdit = new QLineEdit( m_plotCurve->title().text() );
     optionsLayout->addWidget(nameLabel, row, 0);
@@ -154,8 +162,8 @@ namespace Isis {
 
     readSettingsFromCurve();
   }
-   
- 
+
+
   /**
    * This destroys the configuration dialog, which happens when the user closes
    *   it or clicks ok or cancel.
@@ -216,9 +224,9 @@ namespace Isis {
     if (m_selectedCurve > m_plotCurvesList.size() - 1 || m_selectedCurve < 0) {
       throw IException(IException::Programmer, "Curves combobox index out of bounds", _FILEINFO_);
     }
-    
+
     m_plotCurve = m_plotCurvesList[m_selectedCurve];
-    
+
     setWindowTitle( "Configure " + m_plotCurve->title().text() );
 
     // see if the curves combo box exists in the dialog (right-clicking a curve will not create
@@ -234,7 +242,7 @@ namespace Isis {
 //       m_curvesCombo->setItemText( m_curvesCombo->currentIndex(), m_plotCurve->title().text() );
       m_curvesCombo->blockSignals(false);
     }
-    
+
     m_nameEdit->setText( m_plotCurve->title().text() );
 
     QPalette colorPalette;
@@ -267,13 +275,13 @@ namespace Isis {
     }
   }
 
-  
+
   void CubePlotCurveConfigureDialog::updateComboIndex(int selected) {
     m_selectedCurve = selected;
     readSettingsFromCurve();
   }
-  
-  
+
+
   void CubePlotCurveConfigureDialog::updateCurvesList() {
     QList<CubePlotCurve*> newPlotCurveList = qobject_cast<PlotWindow*>(m_parent)->plotCurves();
     // if we deleted a plot curve, the new list will be smaller in size, reset m_selectedCurve
diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.h b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.h
index 8ab61cd297bb78d402d13c6a28614231efaa880e..448fa26c3b119cb08792f8ace06e893ce4f05004 100644
--- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.h
+++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.h
@@ -1,6 +1,14 @@
 #ifndef CubePlotCurveConfigureDialog_h
 #define CubePlotCurveConfigureDialog_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDialog>
 
 #include <QPointer>
@@ -25,8 +33,8 @@ namespace Isis {
    * @internal
    *   @history 2012-01-20 Steven Lambright and Jai Rideout - Completed
    *                           documentation.
-   *   @history 2014-07-25 Ian Humphrey - Added configure tool menu item. This allows user to 
-   *                           right-click a curve (as previously) or select  configure tool menu 
+   *   @history 2014-07-25 Ian Humphrey - Added configure tool menu item. This allows user to
+   *                           right-click a curve (as previously) or select  configure tool menu
    *                           item to configure a plot curve's color, symbol, line style, etc.
    *                           Fixes #2089.
    */
diff --git a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp
index 00cb2a58ace7e6f7056d291fd2599beaa7f8c10d..2bb966ed0d496d6af440a93f07f6221e90ee53bb 100644
--- a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp
+++ b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- * $Date: 2010/06/30 03:38:12 $
- * $Revision: 1.46 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 #include "CubeViewport.h"
 
@@ -377,7 +366,7 @@ namespace Isis {
     }
 
     p_cube = NULL;
-    
+
     delete p_trackingCube;
     p_trackingCube = NULL;
 
diff --git a/isis/src/qisis/objs/CubeViewport/CubeViewport.h b/isis/src/qisis/objs/CubeViewport/CubeViewport.h
index 4d88fd5c00a3325efd1b73a91c58db4bf8021631..83ffc5b47570796c1307e4310c55fca4f1cc478c 100644
--- a/isis/src/qisis/objs/CubeViewport/CubeViewport.h
+++ b/isis/src/qisis/objs/CubeViewport/CubeViewport.h
@@ -1,27 +1,13 @@
 #ifndef CubeViewport_h
 #define CubeViewport_h
 
-/**
- * @file
- * $Date: 2010/06/30 03:38:12 $
- * $Revision: 1.30 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 
 // parent of this class
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp
index 1c24f7876d944b8d31956a4a8ca0acabf13df2ff..fe041225a736a6519a53e56b3ae8a1ce3b6d8ce5 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ViewportBuffer.h"
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.h b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.h
index a9befe0a8fc6bd2d6b3042a090f21a99f61fc4be..747dbbe15b1b1d5f72b7d069fccf56ce5764a1c6 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.h
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.h
@@ -1,28 +1,13 @@
 #ifndef ViewportBuffer_h
 #define ViewportBuffer_h
 
-/**
- * @file
- * $Date: 2010/06/03 18:36:14 $
- * $Revision: 1.14 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- *
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 
@@ -73,7 +58,7 @@ namespace Isis {
    *   @history 2011-04-25 Steven Lambright - Fixed bounding rect calculations
    *                           and fill action creation
    *   @history 2011-06-20 Steven Lambright - Fixed panning issue where panning
-   *                           beyond a full screen was a problem. 
+   *                           beyond a full screen was a problem.
    */
   class ViewportBuffer : public QObject {
       Q_OBJECT
@@ -213,7 +198,7 @@ namespace Isis {
        * give us cube data before we progress through the queue.
        */
       QQueue< ViewportBufferAction * > * p_actions;
-      
+
       bool p_bricksOrdered;
   };
 }
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.cpp
index f5c853caa7dbe71392f2eb984b042ce98cbf18c3..055efd90213c779451ee755f36c435907495bce4 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.cpp
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ViewportBufferAction.h"
 
 namespace Isis {
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.h b/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.h
index ce98ad68c4962b95479ee84313ad635ad23ff5f7..e8effa82b5d6060399e9a9deff790b6b5cc7810c 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.h
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.h
@@ -1,6 +1,13 @@
 #ifndef ViewportBufferAction_h
 #define ViewportBufferAction_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 namespace Isis {
   /**
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.cpp
index 005de630b453fac5ba78ad4a4567b696f8b106be..07b61857dbb9b0309703ed2eed63175e38d3140b 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.cpp
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.cpp
@@ -1,3 +1,10 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "ViewportBufferFill.h"
 
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.h b/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.h
index 65b789310e771c2dc9f3db6f63d32061fb8690e5..55428fc197120c6b634c7f1f25341b3683db8620 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.h
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.h
@@ -1,6 +1,14 @@
 #ifndef VieportBufferFill_h
 #define VieportBufferFill_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ViewportBufferAction.h"
 
 class QRect;
@@ -14,8 +22,8 @@ namespace Isis {
    *   @history 2011-04-25 Steven Lambright - Fixed a problem where 1 too few
    *                       lines were being read
    *   @history 2015-06-30 Makayla Shepherd and Ian Humphrey - Modified stop() to keep the viewport
-   *                       buffer object from reading an extra line at the bottom of the viewport 
-   *                       rectangle. This could potentially cause a crash from reading outside of 
+   *                       buffer object from reading an extra line at the bottom of the viewport
+   *                       rectangle. This could potentially cause a crash from reading outside of
    *                       the bounds. Fixes #2171.
    */
   class ViewportBufferFill : public ViewportBufferAction {
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.cpp
index b4991c051236029e8c2e8cfe3591d3b57c61ae9b..be75f2a4d1a8e8aa3620e4b1a240520dbdef9b61 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.cpp
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ViewportBufferStretch.h"
 
 
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.h b/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.h
index cd88ae16b327e1109bbd9c8181762c0d0397936f..a7ffc98f0c75653aa62207fe0cf98ee744928770 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.h
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.h
@@ -1,6 +1,14 @@
 #ifndef VieportBufferStretch_h
 #define VieportBufferStretch_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ViewportBufferAction.h"
 
 class QRect;
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.cpp
index 504b0e3177de303ef942e74e07541565fafd33dd..1ea67eec3e16ab6ab04c26c0e5007951aa4e4486 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.cpp
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "ViewportBufferTransform.h"
 
diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.h b/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.h
index 0d569ec3a0aa11f1d1ab6cac755cbe3aadb68d51..20e67d6ebf0e4eece03eb6488b0908b414289c80 100644
--- a/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.h
+++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.h
@@ -1,7 +1,14 @@
-
 #ifndef ViewportBufferTransform_h
 #define ViewportBufferTransform_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ViewportBufferAction.h"
 
 
diff --git a/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.cpp b/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.cpp
index cd553f2ac94a09d0347c431fea78948a476c80bd..9c84376185c50b854a834bcfb73e11d8b700614f 100755
--- a/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.cpp
+++ b/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.cpp
@@ -1,23 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "BundleObservationViewWorkOrder.h"
 
 #include <QtDebug>
diff --git a/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.h b/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.h
index ef999cf0c76e92029e85a21f4c96818d04e9a2ad..8d9dccd4f3db93db66539fda9cf4dabf05f0ac15 100755
--- a/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.h
+++ b/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.h
@@ -1,25 +1,14 @@
 #ifndef BundleObservationViewWorkOrder_H
 #define BundleObservationViewWorkOrder_H
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "WorkOrder.h"
 
 #include "FileItem.h"
diff --git a/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.cpp b/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.cpp
index 64864740e7593e219da0c34873b04959543a9f2a..979a688d91269e29e199a6e659044141e4cd2150 100644
--- a/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.cpp
+++ b/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CloseProjectWorkOrder.h"
 
 #include <QCoreApplication>
diff --git a/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.h b/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.h
index 79cafc30864d346ba2cdf8fac747da51e6d190ee..93f1b52004bf122c8266fdee26e3c24aef68c5f9 100644
--- a/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.h
+++ b/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.h
@@ -1,27 +1,14 @@
 #ifndef CloseProjectWorkOrder_H
 #define CloseProjectWorkOrder_H
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "WorkOrder.h"
 
 namespace Isis {
diff --git a/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.cpp b/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.cpp
index 9553e11e2da820e17f2c283fe7dac81ca8a28537..df5f694a3b1b7964924d68827fe0e9ea17ffc6b7 100644
--- a/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.cpp
+++ b/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CnetEditorViewWorkOrder.h"
 
 #include <QtDebug>
diff --git a/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.h b/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.h
index b069b97d5fd403cd16e59013dd23714bb23a8676..17b43777d09c62188cd41237412a5e13b12b5454 100644
--- a/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.h
+++ b/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.h
@@ -1,27 +1,14 @@
 #ifndef CnetEditorViewWorkOrder_H
 #define CnetEditorViewWorkOrder_H
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "WorkOrder.h"
 
 namespace Isis {
diff --git a/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.cpp b/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.cpp
index 9bce86c98aa7277312b944d45c0ee4973536712d..90ecc8f21ce1362525956cc516435093f101d710 100644
--- a/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.cpp
+++ b/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.cpp
@@ -1,23 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ControlHealthMonitorWorkOrder.h"
 
 #include <QMessageBox>
diff --git a/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.h b/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.h
index 92cc63b4f852bb18311ac61fcaade592e94c8b4a..2aee26e272573c3896ed0be401bfc26d2b0a8627 100644
--- a/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.h
+++ b/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.h
@@ -1,25 +1,14 @@
 #ifndef ControlHealthMonitorWorkOrder_H
 #define ControlHealthMonitorWorkOrder_H
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "WorkOrder.h"
 
 namespace Isis {
diff --git a/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.cpp b/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.cpp
index c2d1d2104b559cb7daadce8dc1af2435fada5926..d223298032f806e09e704b9434ec6538484fcd64 100644
--- a/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.cpp
+++ b/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.cpp
@@ -1,23 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "CubeDnViewWorkOrder.h"
 
 #include <QtDebug>
diff --git a/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.h b/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.h
index b0b31193c8b88bd376c3d30618a57d5ca440e371..0d63f823921b88196c8f34bc7182ac65c607c7b1 100644
--- a/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.h
+++ b/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.h
@@ -1,27 +1,14 @@
 #ifndef CubeDnViewWorkOrder_H
 #define CubeDnViewWorkOrder_H
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "WorkOrder.h"
 
 namespace Isis {
diff --git a/isis/src/qisis/objs/Directory/Directory.cpp b/isis/src/qisis/objs/Directory/Directory.cpp
index 1dd2769bae8dd051b409c2216f2c4a619f820a12..d5fc4b8241165174f24356dcc83e24b3e8e4f7a9 100644
--- a/isis/src/qisis/objs/Directory/Directory.cpp
+++ b/isis/src/qisis/objs/Directory/Directory.cpp
@@ -1,25 +1,11 @@
-/**
- * @File
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Directory.h"
 
 
diff --git a/isis/src/qisis/objs/Directory/Directory.h b/isis/src/qisis/objs/Directory/Directory.h
index f5455e3728cd7ea6997b5f85171f501a0eb5de5f..995c27164ff6be7ed4feca0c017987c493a0c930 100644
--- a/isis/src/qisis/objs/Directory/Directory.h
+++ b/isis/src/qisis/objs/Directory/Directory.h
@@ -1,27 +1,13 @@
 #ifndef Directory_H
 #define Directory_H
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QMainWindow>
 #include <QMultiMap>
diff --git a/isis/src/qisis/objs/DisplayProperties/DisplayProperties.cpp b/isis/src/qisis/objs/DisplayProperties/DisplayProperties.cpp
index 07fbd02d33d53a4afa62dce958f3696f125238a8..ac764eec38b2ff5a9d95f17c52e0e63fd45decf3 100644
--- a/isis/src/qisis/objs/DisplayProperties/DisplayProperties.cpp
+++ b/isis/src/qisis/objs/DisplayProperties/DisplayProperties.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "DisplayProperties.h"
 
 #include <QBuffer>
@@ -206,4 +214,3 @@ namespace Isis {
     return XmlStackedHandler::endElement(namespaceURI, localName, qName);
   }
 }
-
diff --git a/isis/src/qisis/objs/DisplayProperties/DisplayProperties.h b/isis/src/qisis/objs/DisplayProperties/DisplayProperties.h
index 3a026888913ed22ad689edcd8c956935c005a058..9b06ff1d5fc93771cde30c85767be542747c23ca 100644
--- a/isis/src/qisis/objs/DisplayProperties/DisplayProperties.h
+++ b/isis/src/qisis/objs/DisplayProperties/DisplayProperties.h
@@ -1,6 +1,14 @@
 #ifndef DisplayProperties_H
 #define DisplayProperties_H
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QObject>
 
 // This is required since QColor is in a slot
@@ -102,4 +110,3 @@ namespace Isis {
 }
 
 #endif
-
diff --git a/isis/src/qisis/objs/EditTool/EditTool.cpp b/isis/src/qisis/objs/EditTool/EditTool.cpp
index 08938c2ba69b935192e7f1639cfb36987167e444..8679b44f6b2d663f6e6a62af03813d7509de7fc1 100644
--- a/isis/src/qisis/objs/EditTool/EditTool.cpp
+++ b/isis/src/qisis/objs/EditTool/EditTool.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.11 $
- * $Date: 2010/06/28 09:00:39 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "EditTool.h"
 
diff --git a/isis/src/qisis/objs/EditTool/EditTool.h b/isis/src/qisis/objs/EditTool/EditTool.h
index 3d9727af158b9e79749e068d886e9753bd77fa96..4571c25afd5ae17af620e7ef618211f9f37c062a 100644
--- a/isis/src/qisis/objs/EditTool/EditTool.h
+++ b/isis/src/qisis/objs/EditTool/EditTool.h
@@ -1,27 +1,13 @@
 #ifndef EditTool_h
 #define EditTool_h
 
-/**
- * @file
- * $Revision: 1.8 $
- * $Date: 2010/06/28 09:00:39 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Tool.h"
 
@@ -79,7 +65,7 @@ namespace Isis {
    *   @history  2017-08-11 Adam Goins - Added a line of code to recreate a cube with "r" permissions
    *                            attempting to open it with "rw" permission failed. This fixes an issue
    *                            where the cube would segfault if it was being edited without "w" permission.
-   *                            Fixes # 2097 
+   *                            Fixes # 2097
    */
   class EditTool : public Tool {
       Q_OBJECT
diff --git a/isis/src/qisis/objs/FileItem/FileItem.h b/isis/src/qisis/objs/FileItem/FileItem.h
index 7b1c4f16fde83590e93d3bf954139832c97b828d..e904289f7776fd068c6d322c62649b89763f59b5 100644
--- a/isis/src/qisis/objs/FileItem/FileItem.h
+++ b/isis/src/qisis/objs/FileItem/FileItem.h
@@ -1,25 +1,13 @@
 #ifndef FileItem_h
 #define FileItem_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QSharedPointer>
 #include <QObject>
@@ -33,7 +21,7 @@ namespace Isis {
    *
    * @author 2017-05-04 J Bonn
    *
-   * @internal 
+   * @internal
    *   @history 2017-05-05 Tracie Sucharski - Renamed accessor method to match Isis standards. Moved
    *                           class to a Directory under qisis/objs.
    */
diff --git a/isis/src/qisis/objs/FindTool/FindTool.h b/isis/src/qisis/objs/FindTool/FindTool.h
index f06d2b36e3bc6a5219bcac33c66c57e22b1bf444..4da090b88af62b85c61459c69b4d0a017341d674 100644
--- a/isis/src/qisis/objs/FindTool/FindTool.h
+++ b/isis/src/qisis/objs/FindTool/FindTool.h
@@ -1,26 +1,13 @@
 #ifndef FindTool_h
 #define FindTool_h
-/**
- * @file
- * $Revision: 1.13 $
- * $Date: 2010/06/28 09:06:59 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // The only includes allowed in this file are parents of classes defined here.
 #include <QWidget>
@@ -119,7 +106,7 @@ namespace Isis {
    *                          to work in more cases. Fixes #953.
    *  @history 2014-05-19 Ian Humphrey - Fixed CTRL+F shortcut and menu option to open Find Tool's
    *                          Find Latitude/Longitude Coordinate dialog window. Added help text
-   *                          to Find Tool menu option. Minor coding standards fixes. 
+   *                          to Find Tool menu option. Minor coding standards fixes.
    *                          Fixes #2087.
    *  @history 2016-03-23 Makayla Shepherd - Added a check on the latitude
    *                          entered that caused an error message to pop up
@@ -133,7 +120,7 @@ namespace Isis {
       ~FindTool();
       void addTo(QMenu *menu);
       void paintViewport(MdiCubeViewport *vp, QPainter *painter);
-      
+
       /**
        * This method returns the menu name associated with this tool.
        *
diff --git a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp
index be208f6e6e6d1086f70fbfbc12592a1b5a4dfdcd..7a01f3c4a69a0f33f3627ad1e687ee0ae606fa35 100644
--- a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp
+++ b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "Footprint2DView.h"
@@ -208,10 +194,10 @@ namespace Isis {
 
 
   /**
-   * Slot to connect to the itemAdded signal from the model. If the item is an image or shape it is 
-   * added to a list. When everything has been added, then the list is added to the scene through 
-   * signal/slot connection from ProjectItemProxyModel signal, itemsAdded which is connected to 
-   * this objects onItemsAdded slot. 
+   * Slot to connect to the itemAdded signal from the model. If the item is an image or shape it is
+   * added to a list. When everything has been added, then the list is added to the scene through
+   * signal/slot connection from ProjectItemProxyModel signal, itemsAdded which is connected to
+   * this objects onItemsAdded slot.
    *
    * @param[in] item (ProjectItem *) The item
    */
@@ -237,9 +223,9 @@ namespace Isis {
 
 
   /**
-   * Slot called once all selected images have been added to the proxy model.  This is much faster 
-   * than adding a single image at a time to the MosaicSceneWidget. This is connected from the 
-   * ProjectItemProxyModel::itemsAdded signal. 
+   * Slot called once all selected images have been added to the proxy model.  This is much faster
+   * than adding a single image at a time to the MosaicSceneWidget. This is connected from the
+   * ProjectItemProxyModel::itemsAdded signal.
    *
    */
   void Footprint2DView::onItemsAdded() {
diff --git a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.h b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.h
index f73769cdbb7a2e97d77d3cb4f8184ae6a82a6ad1..34a8414103971067c18aa6d9b31f3204b142719d 100644
--- a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.h
+++ b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.h
@@ -1,27 +1,14 @@
 #ifndef Footprint2DView_h
 #define Footprint2DView_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QList>
 #include <QMap>
 #include <QSize>
@@ -110,7 +97,7 @@ namespace Isis {
    *                           Image constructor which takes a footprint and id, so that the
    *                           MosaicSceneWidget can properly serialize Shapes that have been added.
    *                           Fixes #5495.
-   *  
+   *
    */
   class Footprint2DView : public AbstractProjectItemView {
 
diff --git a/isis/src/qisis/objs/HelpTool/HelpTool.h b/isis/src/qisis/objs/HelpTool/HelpTool.h
index 371ea48b8b30b906a4d5be31a3d5d2006cf51a01..fc7ca7bceea67593806779c1eab2d40d2939e076 100644
--- a/isis/src/qisis/objs/HelpTool/HelpTool.h
+++ b/isis/src/qisis/objs/HelpTool/HelpTool.h
@@ -1,24 +1,13 @@
 #ifndef HelpTool_h
 #define HelpTool_h
 
-/**
- * @file
- * $Date: 2007/06/14 23:57:15 $ $Revision: 1.2 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QAction>
 #include "Tool.h"
diff --git a/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.cpp b/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.cpp
index dd11ae0ba86b517bd73b3a6087b4a95528895ba4..cdbb0b58901bffe0c6066b3f298a31cd86bc99d6 100644
--- a/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.cpp
+++ b/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- * $Date: 2010/06/28 08:42:54 $
- * $Revision: 1.1 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "IndependentCubeViewport.h"
 
@@ -85,7 +73,7 @@ namespace Isis
     }
   }
 
-  
+
   bool IndependentCubeViewport::eventFilter(QObject * o, QEvent * e)
   {
     // Handle standard mouse tracking on the viewport
@@ -107,7 +95,7 @@ namespace Isis
         {
           if (panning)
             emit synchronize(this);
-            
+
           handleMouseMove(currentPosition);
           break;
         }
@@ -167,8 +155,8 @@ namespace Isis
     globalStretch.CopyPairs(StretchTool::stretchBand(this, StretchTool::Gray));
     stretchGray(globalStretch);
   }
-  
-  
+
+
   void IndependentCubeViewport::showEvent(QShowEvent * event)
   {
     QAbstractScrollArea::show();
@@ -176,20 +164,20 @@ namespace Isis
     CubeViewport::showEvent(event);
     restretch(grayBuffer());
   }
-  
+
 
   void IndependentCubeViewport::resetKnownGlobal()
   {
-    
+
     p_globalStretches->clear();
     for (int i = 0; i < cubeBands(); i++)
       p_globalStretches->append(NULL);
-    
+
     if (isVisible())
       grayBuffer()->addStretchAction();
   }
-  
-  
+
+
   void IndependentCubeViewport::cubeDataChanged(int cubeId,
       const Isis::Brick * data)
   {
@@ -203,44 +191,44 @@ namespace Isis
     {
       // reset the global stretch
       Stretch *& globalStretch = (*p_globalStretches)[data->Band() - 1];
-      
+
       if (globalStretch)
       {
         delete globalStretch;
         globalStretch = NULL;
       }
-      
-    
+
+
       Stretch newGlobal = grayStretch();
       newGlobal.ClearPairs();
       Statistics stats;
       stats.AddData(data->DoubleBuffer(), data->size());
-  
+
       if (stats.ValidPixels() > 1 &&
           fabs(stats.Minimum() - stats.Maximum()) > DBL_EPSILON)
       {
         Histogram hist(stats.BestMinimum(), stats.BestMaximum(), 65536);
         hist.AddData(data->DoubleBuffer(), data->size());
-  
+
         if (fabs(hist.Percent(0.5) - hist.Percent(99.5)) > DBL_EPSILON)
         {
           newGlobal.AddPair(hist.Percent(0.5), 0.0);
           newGlobal.AddPair(hist.Percent(99.5), 255.0);
         }
       }
-  
+
       if (newGlobal.Pairs() == 0)
       {
         newGlobal.AddPair(-DBL_MAX, 0.0);
         newGlobal.AddPair(DBL_MAX, 255.0);
       }
-      
+
       globalStretch = new CubeStretch(newGlobal);
-      
+
       if (isVisible())
         stretchGray(newGlobal);
     }
-    
+
     CubeViewport::cubeDataChanged(cubeId, data);
   }
 
@@ -353,7 +341,7 @@ namespace Isis
       setScale(other->scale(), thisCenterSamp, thisCenterLine);
   }
 
-  
+
   QRect IndependentCubeViewport::bandingRect()
   {
     QRect rect;
@@ -397,7 +385,7 @@ namespace Isis
      << "line: " << line << "\n";
      */
     // if sample and line in range then do tracking
-    
+
     double dn;
     if (sample >= 0.5 && sample <= cubeSamples() + 0.5 &&
         line >= 0.5 && line <= cubeLines() + 0.5 &&
@@ -410,12 +398,12 @@ namespace Isis
       // Determine the projection type if we have a projection
       Projection::ProjectionType projType = Projection::Triaxial;
       if (projSucceeds) projType = projection()->projectionType();
-      
+
       if (camSucceeds || projSucceeds)
       {
         double lat = 0.0;
         double lon = 0.0;
-        
+
         if (camSucceeds)
         {
           lat = camera()->UniversalLatitude();
@@ -435,7 +423,7 @@ namespace Isis
             lon = rproj->RingLongitude();
           }
         }
-        
+
         emit trackingChanged(sample, line, lat, lon, dn, this);
       }
       else
@@ -461,7 +449,7 @@ namespace Isis
       const int bufY = p.y() - rect.top();
       dn = buffer->getLine(bufY)[bufX];
     }
-    
+
     return success;
   }
 
diff --git a/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.h b/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.h
index c0395f4ae48c1885a379aaba2d9fbf4fc0d182d1..e1e7871c5dd320e1ded8925b9d73e65189edfb9e 100644
--- a/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.h
+++ b/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.h
@@ -1,27 +1,13 @@
 #ifndef IndependentCubeViewport_h
 #define IndependentCubeViewport_h
 
-/**
- * @file
- * $Date: 2010/06/28 08:42:54 $
- * $Revision: 1.1 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // parent class
 #include "CubeViewport.h"
@@ -64,21 +50,21 @@ namespace Isis
       IndependentCubeViewport(Cube * cube, CubeDataThread * cdt = 0,
                               QWidget * parent = 0);
       ~IndependentCubeViewport();
-      
+
       bool eventFilter(QObject * o, QEvent * e);
       void paintEvent(QPaintEvent * e);
       void restretch(ViewportBuffer *);
       virtual void showEvent(QShowEvent * e);
-      
-      
+
+
     public slots:
       void resetKnownGlobal();
-      
-      
+
+
     protected slots:
       virtual void cubeDataChanged(int cubeId, const Brick *);
-    
-    
+
+
     signals:
       void synchronize(IndependentCubeViewport *);
       void trackingChanged(double sample, double line, double lat, double lon,
@@ -86,24 +72,24 @@ namespace Isis
       void trackingChanged(double samp, double line, double dn,
           IndependentCubeViewport *);
       void cantTrack(QString, IndependentCubeViewport *);
-      
-    
-    
+
+
+
     private slots:
       void handleMouseMove(QPoint);
       void handleMousePress(QPoint, Qt::MouseButton b);
       void handleMouseRelease(QPoint);
       void handleSynchronization(IndependentCubeViewport *);
-      
-      
+
+
     private: // methods
       QRect bandingRect();
       void stretch();
       void track(const QPoint &);
       void zoom();
       bool trackBuffer(ViewportBuffer *, const QPoint &, double &);
-    
-      
+
+
     private:
       bool banding;
       bool panning;
diff --git a/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.cpp b/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.cpp
index 9b1fe1ac0d95f9b2c6bb6596591b8e1ee0703095..059ddfa533a7b262e952b406ad0c804c7ab0c23d 100644
--- a/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.cpp
+++ b/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- * $Date: 2010/06/30 03:42:28 $
- * $Revision: 1.2 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "MdiCubeViewport.h"
 
diff --git a/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.h b/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.h
index 71b661125d9a7e7aa4818e63c125bbf7fe798234..da8a217f18f4f39ebc2de28085dfc78614d57b5d 100644
--- a/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.h
+++ b/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.h
@@ -1,27 +1,13 @@
 #ifndef MdiCubeViewport_h
 #define MdiCubeViewport_h
 
-/**
- * @file
- * $Date: 2010/06/30 03:42:28 $
- * $Revision: 1.2 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "CubeViewport.h"
 
diff --git a/isis/src/qisis/objs/ProjectItem/ProjectItem.h b/isis/src/qisis/objs/ProjectItem/ProjectItem.h
index b2a5268eebeff0191b7cdde7c20f6027c8a44ac4..51fba8fc5cb8cecd1e1c6a2467142743898c6d41 100644
--- a/isis/src/qisis/objs/ProjectItem/ProjectItem.h
+++ b/isis/src/qisis/objs/ProjectItem/ProjectItem.h
@@ -1,25 +1,13 @@
 #ifndef ProjectItem_h
 #define ProjectItem_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 
 #include <QStandardItem>
diff --git a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp
index 22db1ee5950663deac021cbddb08d14b88853dc3..b1d3c4ffa8832360825a44f1896e958b256d0f13 100644
--- a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp
+++ b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp
@@ -1,23 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ProjectItemModel.h"
diff --git a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.h b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.h
index 0bcf772b71a0759d19b664311707f070c14c9035..dd33f87981f03579c1346a7368d35694e508a3b4 100644
--- a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.h
+++ b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.h
@@ -1,27 +1,13 @@
 #ifndef ProjectItemModel_h
 #define ProjectItemModel_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QStandardItemModel>
 
diff --git a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp
index 415594fb9cf1987a56bc19aa07afd731358a7b25..22f6a463812c746f652fa332f30f763ebe07fea4 100644
--- a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp
+++ b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision$
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "ProjectItemProxyModel.h"
@@ -58,7 +44,7 @@ namespace Isis {
    */
   QModelIndex ProjectItemProxyModel::mapIndexFromSource(const QModelIndex &sourceIndex) {
     ProjectItem *proxyItem = mapItemFromSource( sourceModel()->itemFromIndex(sourceIndex) );
-    
+
     if (proxyItem) {
       return proxyItem->index();
     }
@@ -67,7 +53,7 @@ namespace Isis {
     }
 
   }
-  
+
 
   /**
    * Returns the QModelIndex of an item in the souce model that corresponds with
@@ -79,7 +65,7 @@ namespace Isis {
    */
   QModelIndex ProjectItemProxyModel::mapIndexToSource(const QModelIndex &proxyIndex) {
     ProjectItem *sourceItem = mapItemToSource( itemFromIndex(proxyIndex) );
-    
+
     if (sourceItem) {
       return sourceItem->index();
     }
@@ -125,7 +111,7 @@ namespace Isis {
    */
   QItemSelection ProjectItemProxyModel::mapSelectionToSource(const QItemSelection &proxySelection) {
     QItemSelection sourceSelection = QItemSelection();
-  
+
     foreach ( QModelIndex proxyIndex, proxySelection.indexes() ) {
       QModelIndex sourceIndex = mapIndexToSource(proxyIndex);
       if ( sourceIndex.isValid() ) {
@@ -184,7 +170,7 @@ namespace Isis {
     }
 
     ProjectItem *proxyItem;
-    
+
     if (ProjectItem *parentItem = mapItemFromSource( sourceItem->parent() ) ) {
       proxyItem = addChild(sourceItem, parentItem);
     }
@@ -204,7 +190,7 @@ namespace Isis {
    * Adds a list of items to the proxy model.
    *
    * @param[in] sourceItem (QList<ProjectItem *>) The list of items in the
-   *                                              source model.                                              
+   *                                              source model.
    */
   void ProjectItemProxyModel::addItems(QList<ProjectItem *> sourceItems) {
     foreach (ProjectItem *item, sourceItems) {
@@ -213,7 +199,7 @@ namespace Isis {
     emit itemsAdded();
   }
 
-  
+
   /**
    * Removes an item and its children from the proxy model.
    *
@@ -226,8 +212,8 @@ namespace Isis {
 //  qDebug()<<"ProjectItemProxyModel::removeItem  item= "<<item;
     ProjectItemModel::removeItem(item);
   }
-  
-  
+
+
   /**
    * Sets the source model. If there are already items in the model and the
    * source model is set to a different source model, the proxy model is
@@ -295,13 +281,13 @@ namespace Isis {
     }
   }
 
-  
+
   /**
    * Slot that updates the current item in the proxy model only if it is
    * different than the corresponding item in the source model.
    */
   void ProjectItemProxyModel::updateProxyCurrent() {
-    QModelIndex newProxyCurrent = mapIndexFromSource( 
+    QModelIndex newProxyCurrent = mapIndexFromSource(
         sourceModel()->selectionModel()->currentIndex() );
     if ( newProxyCurrent != selectionModel()->currentIndex() ) {
       selectionModel()->setCurrentIndex(newProxyCurrent, QItemSelectionModel::Current);
@@ -316,7 +302,7 @@ namespace Isis {
   void ProjectItemProxyModel::updateSourceCurrent() {
     QModelIndex newSourceCurrent = mapIndexToSource( selectionModel()->currentIndex() );
     if ( newSourceCurrent != sourceModel()->selectionModel()->currentIndex() ) {
-      sourceModel()->selectionModel()->setCurrentIndex(newSourceCurrent, 
+      sourceModel()->selectionModel()->setCurrentIndex(newSourceCurrent,
                                                        QItemSelectionModel::Current);
     }
   }
@@ -327,13 +313,13 @@ namespace Isis {
    * different than the corresponding selection in the source model.
    */
   void ProjectItemProxyModel::updateProxySelection() {
-    QItemSelection newProxySelection = mapSelectionFromSource( 
+    QItemSelection newProxySelection = mapSelectionFromSource(
         sourceModel()->selectionModel()->selection() );
     if ( newProxySelection != selectionModel()->selection() ) {
       selectionModel()->select(newProxySelection, QItemSelectionModel::ClearAndSelect);
     }
   }
- 
+
 
   /**
    * Slot that updates the selection in the source model only if it is
@@ -341,9 +327,9 @@ namespace Isis {
    */
   void ProjectItemProxyModel::updateSourceSelection() {
     QItemSelection newSourceSelection = mapSelectionToSource( selectionModel()->selection() );
-    if ( mapSelectionFromSource(newSourceSelection) != 
+    if ( mapSelectionFromSource(newSourceSelection) !=
          mapSelectionFromSource( sourceModel()->selectionModel()->selection() ) ) {
-      sourceModel()->selectionModel()->select(newSourceSelection, 
+      sourceModel()->selectionModel()->select(newSourceSelection,
                                               QItemSelectionModel::ClearAndSelect);
     }
   }
@@ -378,9 +364,9 @@ namespace Isis {
     if ( parentItem && (parentItem->model() != this) ) {
       return 0;
     }
-    
+
     ProjectItem *proxyItem = mapItemFromSource(sourceItem);
-    
+
     if (!proxyItem) {
       proxyItem = new ProjectItem();
       proxyItem->setProjectItem(sourceItem);
@@ -436,7 +422,7 @@ namespace Isis {
     return true;
   }
 
-  
+
   /**
    * Adds the data (selected items) from the source model to the proxy model.
    *
@@ -444,7 +430,7 @@ namespace Isis {
    * @param action (Qt::DropAction)
    * @param row (int)
    * @param column(int)
-   * @param QModelIndex (const QModelIndex &) 
+   * @param QModelIndex (const QModelIndex &)
    *
    * @return @b bool True if the data was successfully added to the proxy model.
    */
diff --git a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.h b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.h
index e078445b3236fadf99cc6c1501c744697fbcf8de..879b16af13f66896db4c6e4d9de8f954aad6d4a1 100644
--- a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.h
+++ b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.h
@@ -1,27 +1,13 @@
 #ifndef ProjectItemProxyModel_h
 #define ProjectItemProxyModel_h
-/**
- * @file
- * $Revision$
- * $Date$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QList>
 #include <QMap>
@@ -74,7 +60,7 @@ namespace Isis {
    * @internal
    *   @history 2015-10-21 Jeffrey Covington - Original version.
    *   @history 2016-01-13 Jeffrey Covington - Added canDropMimeData() and dropMimeData() methods.
-   *   @history 2016-06-27 Ian Humphrey - Added documentation to the canDropMimeData() and 
+   *   @history 2016-06-27 Ian Humphrey - Added documentation to the canDropMimeData() and
    *                           dropMimeData() methods. Checked coding standards. Fixes #4006.
    *   @history 2016-08-11 Tracie Sucharski - Added itemRemoved signal.
    *   @history 2016-08-25 Adam Paquette - Updated documentation. Fixes #4299.
@@ -84,10 +70,10 @@ namespace Isis {
   class ProjectItemProxyModel : public ProjectItemModel {
 
   Q_OBJECT
-  
+
   public:
     ProjectItemProxyModel(QObject *parent = 0);
-    
+
     QModelIndex mapIndexFromSource(const QModelIndex &sourceIndex);
     QModelIndex mapIndexToSource(const QModelIndex &proxyIndex);
 
@@ -96,7 +82,7 @@ namespace Isis {
 
     ProjectItem *mapItemFromSource(ProjectItem *sourceItem);
     ProjectItem *mapItemToSource(ProjectItem *proxyItem);
-    
+
     void removeItem(ProjectItem *item);
 
     void setSourceModel(ProjectItemModel *sourceModel);
@@ -111,11 +97,11 @@ namespace Isis {
     // This signal was added to speed up the Footprint2DView. Previously images were added one at a
     // time which was extremely slow. This not the ideal handling, but without re-writing
     // ProjectItemModel  and ProjectItemProxyModel to add insertRows method so that beginInsertRows
-    // and endInsertRows are called which would automatically emit the signal rowsInserted after 
+    // and endInsertRows are called which would automatically emit the signal rowsInserted after
     // alls items are inserted into the model rather than calling after each row that is inserted.
     void itemsAdded();
     void itemRemoved(ProjectItem *);
-  
+
   public slots:
     ProjectItem *addItem(ProjectItem *sourceItem);
     void addItems(QList<ProjectItem *> sourceItems);
@@ -132,7 +118,7 @@ namespace Isis {
 
   private slots:
     void onItemChanged(QStandardItem *item);
-    
+
   private:
     ProjectItemModel *m_sourceModel; //!< The source model.
     //! Map of items from the source model to the proxy model.
diff --git a/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.cpp b/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.cpp
index 185a21a3139971ee47a11ced4f199c7474a48ffe..42a40f97692e3a797604d3defe7617c6d7feda4b 100644
--- a/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.cpp
+++ b/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ProjectItemTreeView.h"
 
 #include <QAbstractItemView>
diff --git a/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.h b/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.h
index bafbf26af888197ad9f6bcee8f0d7b9d6ad23345..bbe3872ffbfd11c85c3c9e1bb7c71e50fded6cb8 100644
--- a/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.h
+++ b/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.h
@@ -1,27 +1,13 @@
 #ifndef ProjectItemTreeView_h
 #define ProjectItemTreeView_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "AbstractProjectItemView.h"
 
diff --git a/isis/src/qisis/objs/QHistogram/QHistogram.cpp b/isis/src/qisis/objs/QHistogram/QHistogram.cpp
index 608cae8f4c0004c606eac98a35966e8eb4427fed..b53741499e5477596779df53565a9b014d00a94b 100644
--- a/isis/src/qisis/objs/QHistogram/QHistogram.cpp
+++ b/isis/src/qisis/objs/QHistogram/QHistogram.cpp
@@ -1,24 +1,10 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2008/07/15 16:52:37 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "QHistogram.h"
 #include "Histogram.h"
@@ -237,4 +223,3 @@ namespace Isis {
   }
 
 } // end namespace isis
-
diff --git a/isis/src/qisis/objs/QHistogram/QHistogram.h b/isis/src/qisis/objs/QHistogram/QHistogram.h
index bdbfc9b819c20a13e0ceebb801cd7edac8b7121e..fd514d3c6666e473ab85b72d3c5959e66a158b49 100644
--- a/isis/src/qisis/objs/QHistogram/QHistogram.h
+++ b/isis/src/qisis/objs/QHistogram/QHistogram.h
@@ -1,26 +1,13 @@
 #ifndef QHistogram_h
 #define QHistogram_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/06/19 18:43:47 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "Histogram.h"
 #include <QWidget>
diff --git a/isis/src/qisis/objs/QIsisApplication/QIsisApplication.h b/isis/src/qisis/objs/QIsisApplication/QIsisApplication.h
index dc0b496c7949bf237610fbaa350ab22a957e8df3..091b4b0990cbec96887236181db50137723b6115 100644
--- a/isis/src/qisis/objs/QIsisApplication/QIsisApplication.h
+++ b/isis/src/qisis/objs/QIsisApplication/QIsisApplication.h
@@ -1,27 +1,13 @@
 #ifndef QIsisApplication_H
 #define QIsisApplication_H
 
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2010/06/29 23:46:35 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 
 #include <QApplication>
diff --git a/isis/src/qisis/objs/QnetTools/QnetFileTool.h b/isis/src/qisis/objs/QnetTools/QnetFileTool.h
index b7e5db59521fc8000bc2cd93880c77f8b8a8f72a..1ea58b51154a4437d128ee181e9de9948ee0eaf0 100644
--- a/isis/src/qisis/objs/QnetTools/QnetFileTool.h
+++ b/isis/src/qisis/objs/QnetTools/QnetFileTool.h
@@ -1,27 +1,13 @@
 #ifndef QnetFileTool_h
 #define QnetFileTool_h
 
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2010/07/01 19:04:52 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "FileTool.h"
 #include <QCloseEvent>
diff --git a/isis/src/qisis/objs/QnetTools/QnetNavTool.h b/isis/src/qisis/objs/QnetTools/QnetNavTool.h
index cbd7fffa8edfcaedd07cdbd9abd4844cccada15c..0d92366b3669217fbfc5d3406e4b543bc405ac0e 100644
--- a/isis/src/qisis/objs/QnetTools/QnetNavTool.h
+++ b/isis/src/qisis/objs/QnetTools/QnetNavTool.h
@@ -1,24 +1,13 @@
 #ifndef QnetNavTool_h
 #define QnetNavTool_h
 
-/**
- * @file
- * $Date: 2010/07/01 19:04:52 $ $Revision: 1.20 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 
 #include "Tool.h"
diff --git a/isis/src/qisis/objs/QnetTools/QnetPointCubeNameFilter.h b/isis/src/qisis/objs/QnetTools/QnetPointCubeNameFilter.h
index 67750a4cd9bc62266f5a48929a925bab507b266e..59b6fffee9eb3ef5b5e6955688746b81d5fe8b83 100644
--- a/isis/src/qisis/objs/QnetTools/QnetPointCubeNameFilter.h
+++ b/isis/src/qisis/objs/QnetTools/QnetPointCubeNameFilter.h
@@ -1,24 +1,13 @@
 #ifndef QnetPointCubeNameFilter_h
 #define QnetPointCubeNameFilter_h
-/**
- * @file
- * $Date: 2010/06/03 20:13:53 $
- * $Revision: 1.2 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "QnetFilter.h"
 
diff --git a/isis/src/qisis/objs/QnetTools/QnetPointJigsawErrorFilter.h b/isis/src/qisis/objs/QnetTools/QnetPointJigsawErrorFilter.h
index 34b336fbd0bb6c05586c57cfa386e627bcbf7347..4d11aea86d771cbbe789d6074b286d4a4751b7ef 100644
--- a/isis/src/qisis/objs/QnetTools/QnetPointJigsawErrorFilter.h
+++ b/isis/src/qisis/objs/QnetTools/QnetPointJigsawErrorFilter.h
@@ -1,24 +1,13 @@
 #ifndef QnetPointJigsawErrorFilter_h
 #define QnetPointJigsawErrorFilter_h
-/**
- * @file
- * $Date: 2010/06/03 20:13:53 $
- * $Revision: 1.6 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "QnetFilter.h"
 
diff --git a/isis/src/qisis/objs/QnetTools/QnetPointRegistrationErrorFilter.h b/isis/src/qisis/objs/QnetTools/QnetPointRegistrationErrorFilter.h
index 09fabb7755ea9099e9f1cf0702b551318ccef5b5..9062ef64edb15e37903d183b703c47cb2b7a7574 100644
--- a/isis/src/qisis/objs/QnetTools/QnetPointRegistrationErrorFilter.h
+++ b/isis/src/qisis/objs/QnetTools/QnetPointRegistrationErrorFilter.h
@@ -1,24 +1,13 @@
 #ifndef QnetPointRegistrationErrorFilter_h
 #define QnetPointRegistrationErrorFilter_h
-/**
- * @file
- * $Date: 2010/06/03 20:13:53 $
- * $Revision: 1.6 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "QnetFilter.h"
 
@@ -30,8 +19,8 @@ namespace Isis {
 
   /**
    * Defines the Registration Error filter for the QnetNavTool's Points section.
-   * The user may enter values for Less Than and/or Greater Than. This class is 
-   * designed to remove points from the current filtered list that lie outside 
+   * The user may enter values for Less Than and/or Greater Than. This class is
+   * designed to remove points from the current filtered list that lie outside
    * of the given range.
    *
    * @author ????-??-?? Unknown
diff --git a/isis/src/qisis/objs/SaveAsDialog/SaveAsDialog.h b/isis/src/qisis/objs/SaveAsDialog/SaveAsDialog.h
index b7103f3b129bbb12f957963ca9164458803ac26a..3f0340e20fd28f72188cb67bf0b22d8c6182a8f4 100644
--- a/isis/src/qisis/objs/SaveAsDialog/SaveAsDialog.h
+++ b/isis/src/qisis/objs/SaveAsDialog/SaveAsDialog.h
@@ -1,24 +1,14 @@
 #ifndef SaveAsDialog_h
 #define SaveAsDialog_h
 
-/**
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
- 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QCheckBox>
 #include <QRadioButton>
 #include "FileDialog.h"
@@ -26,15 +16,15 @@
 namespace Isis {
 
   /**
-  * @brief Widget to save(Save As) Isis cubes(used in qview) to display the 
-  * FileDialog to select the output cube. This dialog additionally displays 
-  * radio buttons for choices FullImage, ExportAsIs, ExportFullRes. These choices 
-  * are located at the bottom of the dialog. 
-  *  
-  * FullImage     - copies the entire image into the user specified output file 
-  * ExportAsIs    - copies the image as displayed in the qview app window 
-  * ExportFullRes - copies the image as displayed in the qview app window but with 
-  *                 full resolution 
+  * @brief Widget to save(Save As) Isis cubes(used in qview) to display the
+  * FileDialog to select the output cube. This dialog additionally displays
+  * radio buttons for choices FullImage, ExportAsIs, ExportFullRes. These choices
+  * are located at the bottom of the dialog.
+  *
+  * FullImage     - copies the entire image into the user specified output file
+  * ExportAsIs    - copies the image as displayed in the qview app window
+  * ExportFullRes - copies the image as displayed in the qview app window but with
+  *                 full resolution
   *
   * @ingroup Visualization Tools
   *
@@ -42,7 +32,7 @@ namespace Isis {
   *
   * @internal
   *   @history 2011-05-11  Sharmila Prasad - Initial Version
-  *   @history 2017-06-01  Kaj Williams - renamed "save as ..." radio buttons to reflect their actual usage. Updated the associated tooltips. 
+  *   @history 2017-06-01  Kaj Williams - renamed "save as ..." radio buttons to reflect their actual usage. Updated the associated tooltips.
   *                        Also updated the "enum saveAsType"  documentation.
   */
   class SaveAsDialog : public FileDialog {
@@ -54,7 +44,7 @@ namespace Isis {
       **/
       enum saveAsType {FullImage, ExportAsIs, ExportFullRes};
       int getSaveAsType();
-      
+
     public slots:
       void setFullImage(bool);
       void setAsIs(bool);
diff --git a/isis/src/qisis/objs/Shape/Shape.h b/isis/src/qisis/objs/Shape/Shape.h
index e9add6d1864d0a5997610e0bc6a2a3c97f77b879..82a32b822149be014ef64c241edcb1fdccf079b8 100644
--- a/isis/src/qisis/objs/Shape/Shape.h
+++ b/isis/src/qisis/objs/Shape/Shape.h
@@ -1,24 +1,14 @@
-
 #ifndef Shape_H
 #define Shape_H
-/**
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QObject>
 
 #include <QString>
diff --git a/isis/src/qisis/objs/ShapeDisplayProperties/ShapeDisplayProperties.h b/isis/src/qisis/objs/ShapeDisplayProperties/ShapeDisplayProperties.h
index 1fa595349d7daf77205b12927a3bcb676fc00754..13cbf4f94cc2194d13b9892d6a0d0571951e07a3 100644
--- a/isis/src/qisis/objs/ShapeDisplayProperties/ShapeDisplayProperties.h
+++ b/isis/src/qisis/objs/ShapeDisplayProperties/ShapeDisplayProperties.h
@@ -1,27 +1,13 @@
 #ifndef ShapeDisplayProperties_H
 #define ShapeDisplayProperties_H
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2012/06/12 06:30:00 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QColor> // This is required since QColor is in a slot
 #include <QMetaType> // required since we're adding to QVariant
@@ -170,4 +156,3 @@ namespace Isis {
 Q_DECLARE_METATYPE(QList<Isis::ShapeDisplayProperties *>);
 
 #endif
-
diff --git a/isis/src/qisis/objs/ShapeList/ShapeList.cpp b/isis/src/qisis/objs/ShapeList/ShapeList.cpp
index 09c48ce1553a245e8c1cc366878fbeafa6374299..75d5127c348fa41769376161ff7e943f80f86520 100644
--- a/isis/src/qisis/objs/ShapeList/ShapeList.cpp
+++ b/isis/src/qisis/objs/ShapeList/ShapeList.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ShapeList.h"
 
 #include <QDebug>
@@ -99,7 +85,7 @@ namespace Isis {
 
   /**
    * Creates an shape list from a list of cube file names. This is slow (serial) and not recommended.
-   * 
+   *
    * @param fileNames The list of cube fileNames.
    */
   ShapeList::ShapeList(QStringList &fileNames) {
@@ -123,7 +109,7 @@ namespace Isis {
 
   /**
    * Creates a SerialNumberList from the shape list.
-   * 
+   *
    * @return @b SerialNumberList The list of serial numbers for the cubes in the ShapeList.
    */
   SerialNumberList ShapeList::serialNumberList() {
@@ -139,9 +125,9 @@ namespace Isis {
 
   /**
    * Appends an shape to the shape list.
-   * 
+   *
    * @param value The shape to be appended.
-   * 
+   *
    * @see QList<Shape *>::append().
    */
   void ShapeList::append(Shape * const &value) {
@@ -152,9 +138,9 @@ namespace Isis {
 
   /**
    * Appends a list of shapes to the shape list.
-   * 
+   *
    * @param value the list of shapes to be appened.
-   * 
+   *
    * @see QList<Shape *>::append().
    */
   void ShapeList::append(const QList<Shape *> &value) {
@@ -165,7 +151,7 @@ namespace Isis {
 
   /**
    * Clears the shape list.
-   * 
+   *
    * @see QList<Shape *>::clear().
    */
   void ShapeList::clear() {
@@ -179,11 +165,11 @@ namespace Isis {
 
   /**
    * Erases a single shape from the shape list.
-   * 
+   *
    * @param pos An iterator pointing to the shape to be erased.
-   * 
+   *
    * @return @b QList::iterator An iterator pointing to the shape after the shape that was removed.
-   * 
+   *
    * @see QList<Shape *>::erase()
    */
   QList<Shape *>::iterator ShapeList::erase(iterator pos) {
@@ -196,13 +182,13 @@ namespace Isis {
   /**
    * Erases a range of shapes from the shape list.
    * Erases all shapes from begin up to (but not including) end.
-   * 
+   *
    * @param begin An iterator pointing to the first shape to be erased.
    * @param end An iterator pointing to the shape just after the last shape to be erased.
    *                Will be invalid after the call.
-   * 
+   *
    * @return @b QList::iterator An iterator pointing to the shape end refered to before the call.
-   * 
+   *
    * @see QList<Shape *>::erase()
    */
   QList<Shape *>::iterator ShapeList::erase(iterator begin, iterator end) {
@@ -214,10 +200,10 @@ namespace Isis {
 
   /**
    * Inserts an shape into the shape list at an index
-   * 
+   *
    * @param i The index at which to insert the shape.
    * @param value the shape to be inserted.
-   * 
+   *
    * @see QList<Shape *>::insert()
    */
   void ShapeList::insert(int i, Shape * const &value) {
@@ -229,12 +215,12 @@ namespace Isis {
 
   /**
    * Inserts an shape into the shape list after an iterator.
-   * 
+   *
    * @param before An iterator pointing to the shape that value will be inserted after
    * @param value The shape to be inserted.
-   * 
+   *
    * @return @b QList::iterator An iterator pointing to the inserted shape.
-   * 
+   *
    * @see QList<Shape *>::insert()
    */
   QList<Shape *>::iterator ShapeList::insert(iterator before, Shape * const &value) {
@@ -246,9 +232,9 @@ namespace Isis {
 
   /**
    * Inserts an shape at the beginning of the shape list.
-   * 
+   *
    * @param value The shape to be inserted.
-   * 
+   *
    * @see QList<Shape *>::prepend()
    */
   void ShapeList::prepend(Shape * const &value) {
@@ -260,9 +246,9 @@ namespace Isis {
   /**
    * Appends an shape to the end of the shape list.
    * Equivalent to append().
-   * 
+   *
    * @param value The shape to be appended.
-   * 
+   *
    * @see QList<Shape *>::push_back()
    */
   void ShapeList::push_back(Shape * const &value) {
@@ -274,9 +260,9 @@ namespace Isis {
   /**
    * Prepends an shape to the beginning of the shape list.
    * Equivalent to prepend().
-   * 
+   *
    * @param value The shape to be appended.
-   * 
+   *
    * @see QList<Shape *>::push_front()
    */
   void ShapeList::push_front(Shape * const &value) {
@@ -287,11 +273,11 @@ namespace Isis {
 
   /**
    * Removes all occurances of an shape.
-   * 
+   *
    * @param value The shape to be removed.
-   * 
+   *
    * @return @b int The number of occurances of the shape.
-   * 
+   *
    * @see QList<Shape *>::removeAll()
    */
   int ShapeList::removeAll(Shape * const &value) {
@@ -307,9 +293,9 @@ namespace Isis {
 
   /**
    * Removes the shape at an index.
-   * 
+   *
    * @param i The index of the shape to be removed.
-   * 
+   *
    * @see QList<Shape *>::removeAt()
    */
   void ShapeList::removeAt(int i) {
@@ -320,7 +306,7 @@ namespace Isis {
 
   /**
    * Removes the shape at the front of the shape list.
-   * 
+   *
    * @see QList<Shape *>::removeFirst()
    */
   void ShapeList::removeFirst() {
@@ -331,7 +317,7 @@ namespace Isis {
 
   /**
    * Removes the shape at the end of the shape list.
-   * 
+   *
    * @see QList<Shape *>::removeLast()
    */
   void ShapeList::removeLast() {
@@ -342,11 +328,11 @@ namespace Isis {
 
   /**
    * Removes the first occurance of an shape.
-   * 
+   *
    * @param value The shape to be removed.
-   * 
+   *
    * @return @b bool True if successful, otherwise false.
-   * 
+   *
    * @see QList<Shape *>::removeOne()
    */
   bool ShapeList::removeOne(Shape * const &value) {
@@ -362,9 +348,9 @@ namespace Isis {
 
   /**
    * Swaps the shape list with another list of shapes.
-   * 
+   *
    * @param other The list of shapes to swapped with.
-   * 
+   *
    * @see QList<Shape *>::swap()
    */
   void ShapeList::swap(QList<Shape *> &other) {
@@ -378,11 +364,11 @@ namespace Isis {
 
   /**
    * Removes the shape at an index and returns it.
-   * 
+   *
    * @param i The index of the shape to be removed and returned.
-   * 
+   *
    * @return @b Shape * The removed shape.
-   * 
+   *
    * @see QList<Shape *>::takeAt()
    */
   Shape *ShapeList::takeAt(int i) {
@@ -394,9 +380,9 @@ namespace Isis {
 
   /**
    * Removes and returns the first shape.
-   * 
+   *
    * @return @b Shape * The first shape.
-   * 
+   *
    * @see QList<Shape *>::takeFirst()
    */
   Shape *ShapeList::takeFirst() {
@@ -408,9 +394,9 @@ namespace Isis {
 
   /**
    * Removes and returns the last shape.
-   * 
+   *
    * @return @b Shape * The last shape.
-   * 
+   *
    * @see QList<Shape *>::takeLast()
    */
   Shape *ShapeList::takeLast() {
@@ -422,11 +408,11 @@ namespace Isis {
 
   /**
    * Appends a list of shapes to the end of the shape list.
-   * 
+   *
    * @param other The list of shapes to be appended.
-   * 
+   *
    * @return @b ShapeList & A reference to the shapeList.
-   * 
+   *
    * @see append()
    * @see QList<Shape *>::operator+=()
    */
@@ -443,11 +429,11 @@ namespace Isis {
 
   /**
    * Appends a single shape to the end of the shape list.
-   * 
+   *
    * @param other The shape to be appended.
-   * 
+   *
    * @return @b ShapeList & A reference to the shapeList.
-   * 
+   *
    * @see append()
    * @see QList<Shape *>::operator+=()
    */
@@ -460,11 +446,11 @@ namespace Isis {
 
   /**
    * Appends a list of shapes to the end of the shape list.
-   * 
+   *
    * @param other The list of shapes to be appended.
-   * 
+   *
    * @return @b ShapeList & A reference to the shapeList.
-   * 
+   *
    * @see append()
    * @see QList<Shape *>::operator<<()
    */
@@ -481,11 +467,11 @@ namespace Isis {
 
   /**
    * Appends a single shape to the end of the shape list.
-   * 
+   *
    * @param other The shape to be appended.
-   * 
+   *
    * @return @b ShapeList & A reference to the shapeList.
-   * 
+   *
    * @see append()
    * @see QList<Shape *>::operator<<()
    */
@@ -498,11 +484,11 @@ namespace Isis {
 
   /**
    * Assigns another list of shapes to the shape list.
-   * 
+   *
    * @param rhs The list of shapes that shapeList will become a copy of.
-   * 
+   *
    * @return @b ShapeList & A reference to the shapeList.
-   * 
+   *
    * @see QList<Shape *>::operator=()
    */
   ShapeList &ShapeList::operator=(const QList<Shape *> &rhs) {
@@ -521,7 +507,7 @@ namespace Isis {
    * Assignment operator
    *
    * @param rhs The right hand side of the '=' operator
-   * 
+   *
    * @return @b ShapeList & This shape list.
    */
   ShapeList &ShapeList::operator=(const ShapeList &rhs) {
@@ -584,9 +570,9 @@ namespace Isis {
 
   /**
    * Delete all of the contained Shapes from disk.
-   * 
+   *
    * @param project The project the shapes in the shape list belong to.
-   * 
+   *
    * @see Shape::deleteFromDisk()
    */
   void ShapeList::deleteFromDisk(Project *project) {
@@ -618,11 +604,11 @@ namespace Isis {
    *     ...
    *   </shapes>
    * </pre>
-   * 
+   *
    * @param stream XmlStream to write out the document.
    * @param project The project the shape list will be saved to.
    * @param newProjectRoot The path to the root directory for the new project.
-   * 
+   *
    * @throws iException::Io "Failed to create directory"
    * @throws iException::Io "Unable to save shape information because new file could not be opened for writing"
    */
@@ -700,7 +686,7 @@ namespace Isis {
 
   /**
    * Constructor for CopyShapeDataFunctor.
-   * 
+   *
    * @param project The project that the shape data will be saved to when the functor is used
    * @param newProjectRoot The path to the project root
    */
@@ -713,7 +699,7 @@ namespace Isis {
 
   /**
    * Copy constructor for CopyShapeDataFunctor.
-   * 
+   *
    * @param other The functor to copy from
    */
   ShapeList::CopyShapeDataFunctor::CopyShapeDataFunctor(const CopyShapeDataFunctor &other) {
@@ -732,9 +718,9 @@ namespace Isis {
   /**
    * Copies the cub/ecub files for an shape into m_project.
    * Used by save to copy the shapeList into a new project.
-   * 
+   *
    * @param shapeToCopy The shape to copy into m_project.
-   * 
+   *
    * @see save
    */
   void *ShapeList::CopyShapeDataFunctor::operator()(Shape * const &shapeToCopy) {
@@ -745,9 +731,9 @@ namespace Isis {
 
   /**
    * Assignment operator for CopyShapeDataFunctor.
-   * 
+   *
    * @param rhs The functor to assign from
-   * 
+   *
    * @return @b ShapeList::CopyShapeDataFunctor & A reference to a copy of the functor
    */
   ShapeList::CopyShapeDataFunctor &ShapeList::CopyShapeDataFunctor::operator=(
@@ -763,7 +749,7 @@ namespace Isis {
    *
    * @param shapeList The shape list we're going to be initializing
    * @param project The project that contains the shape list
-   * 
+   *
    * @see ShapeList::save()
    */
   ShapeList::XmlHandler::XmlHandler(ShapeList *shapeList, Project *project) {
@@ -808,7 +794,7 @@ namespace Isis {
    * file.
    *
    * @return @b bool If we should continue reading the XML (usually true).
-   * 
+   *
    * @throws IException::Io "Unable to open with read access"
    * @throws IException::Io "Failed to open shape list XML"
    */
diff --git a/isis/src/qisis/objs/SortFilterProxyModel/SortFilterProxyModel.h b/isis/src/qisis/objs/SortFilterProxyModel/SortFilterProxyModel.h
index 9a697014f2cd96054d4590fc4e1183e9d3e77395..9d1405d0a85dc0543181be63dba13b6e37fe127d 100644
--- a/isis/src/qisis/objs/SortFilterProxyModel/SortFilterProxyModel.h
+++ b/isis/src/qisis/objs/SortFilterProxyModel/SortFilterProxyModel.h
@@ -1,25 +1,13 @@
-
 #ifndef SortFilterProxyModel_h
 #define SortFilterProxyModel_h
 
-/**
- * @file
- * $Date: 2018/06/88 16:40:33 $ $Revision: 1.0 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QList>
 #include <QIdentityProxyModel>
@@ -38,7 +26,7 @@ namespace Isis {
 class ProjectItem;
 class ProjectItemModel;
 
-  /**  
+  /**
    *
    * @author 2018-06-18 Tyler Wilson
    *
@@ -46,7 +34,7 @@ class ProjectItemModel;
    *   @history 2018-06-18 Tyler Wilson - Original version. A proxy class for filtering data
    *   within the JigsawSetupDialog Bundle Observation Solve Settings (BOSS) tab.
    */
-     
+
     class SortFilterProxyModel : public QSortFilterProxyModel  {
     Q_OBJECT
 
diff --git a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.h b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.h
index 1b3030d1f3a95b359476687a86295d3dca0e7958..a44ea7131a5084767574be2f77d2720428976bd0 100644
--- a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.h
+++ b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.h
@@ -1,28 +1,13 @@
 #ifndef SpectralPlotWindow_h
 #define SpectralPlotWindow_h
 
-/**
- * @file
- * $Revision: 1.17 $
- * $Date: 2009/04/07 16:19:40 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "PlotWindow.h"
 
diff --git a/isis/src/qisis/objs/StatisticsTool/StatisticsTool.h b/isis/src/qisis/objs/StatisticsTool/StatisticsTool.h
index 32b1ba97de8ff298cf1bc530aa82800536de2e01..c173521b0c078aee52cc8ed0712f7d3d5f2ed158 100644
--- a/isis/src/qisis/objs/StatisticsTool/StatisticsTool.h
+++ b/isis/src/qisis/objs/StatisticsTool/StatisticsTool.h
@@ -1,24 +1,13 @@
 #ifndef StatisticsTool_h
 #define StatisticsTool_h
 
-/**
- * @file
- * $Date: 2010/06/28 09:21:33 $ $Revision: 1.3 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QAction>
 #include <QPixmap>
diff --git a/isis/src/qisis/objs/StretchTool/StretchTool.h b/isis/src/qisis/objs/StretchTool/StretchTool.h
index 13a5e938ec4c0d7b0fa5ffcd531307a2f06872f2..8e38ffe472b8c07ef337cc6ee1d9aa9fc52a7af8 100644
--- a/isis/src/qisis/objs/StretchTool/StretchTool.h
+++ b/isis/src/qisis/objs/StretchTool/StretchTool.h
@@ -1,6 +1,14 @@
 #ifndef StretchTool_h
 #define StretchTool_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // This is the only include allowed in this file!
 #include "Tool.h"
 
@@ -10,28 +18,6 @@ class QLineEdit;
 class QRect;
 class QToolButton;
 
-/**
- * @file
- * $Revision: 1.16 $
- * $Date: 2010/06/30 03:45:09 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
-
 namespace Isis {
   class AdvancedStretchDialog;
   class Cube;
@@ -91,9 +77,9 @@ namespace Isis {
    *                          between viewports, and another that caused the stretch
    *                          to be copied the new viewport if the advanced stretch
    *                          dialog is active. Fixes #771.
-   *  @history 2015-08-07 Makayla Shepherd - No longer crashes when the user attempts 
+   *  @history 2015-08-07 Makayla Shepherd - No longer crashes when the user attempts
    *                          to apply a stretch while the cube is still loading. This
-   *                          crash was caused by an unhandled exception being thrown 
+   *                          crash was caused by an unhandled exception being thrown
    *                          in a connected slot. Fixes #2117.
    */
   class StretchTool : public Tool {
@@ -173,7 +159,7 @@ namespace Isis {
       void mouseButtonRelease(QPoint p, Qt::MouseButton s);
       void saveStretchToCube();
       void deleteFromCube();
-      void loadStretchFromCube(); 
+      void loadStretchFromCube();
       void enableRubberBandTool();
       void screenPixelsChanged();
       void updateHistograms();
@@ -220,4 +206,3 @@ namespace Isis {
 };
 
 #endif
-
diff --git a/isis/src/qisis/objs/Tab/Tab.h b/isis/src/qisis/objs/Tab/Tab.h
index b20733e96cbddd805ad9a1466852cb9eb6e250ef..8cd490abfb951c409846fc7c505939a164f409c4 100644
--- a/isis/src/qisis/objs/Tab/Tab.h
+++ b/isis/src/qisis/objs/Tab/Tab.h
@@ -1,27 +1,13 @@
 #ifndef Tab_H
 #define Tab_H
 
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2010/05/07 20:39:19 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // QAction is the parent of this class, and should be the ONLY include
 // in this file.  Do not add any other includes to this header file!
@@ -71,12 +57,12 @@ namespace Isis
     signals:
       void clicked(const int &);
 
-      
+
     private:
       Tab(const Tab & other);
       const Tab & operator=(Tab);
-      
-      
+
+
     private slots:
       void handleTriggered();
 
diff --git a/isis/src/qisis/objs/TabBar/TabBar.h b/isis/src/qisis/objs/TabBar/TabBar.h
index 0ab16e4599fb83db88994e737c076673e7a26079..84d4ab4bcdde4786081afdb3c0d0ee6335742b7e 100644
--- a/isis/src/qisis/objs/TabBar/TabBar.h
+++ b/isis/src/qisis/objs/TabBar/TabBar.h
@@ -1,27 +1,13 @@
 #ifndef TabBar_H
 #define TabBar_H
 
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2010/06/04 03:20:32 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 // QToolBar is the parent of this class, and should be the ONLY include
 // in this file.  Do not add any other includes to this header file!
diff --git a/isis/src/qisis/objs/TargetBody/TargetBody.h b/isis/src/qisis/objs/TargetBody/TargetBody.h
index 94b2bef234f26eda63e1d0e74a61cf04d145e832..7c54351190251e36b30b3950760f7dee6b967480 100644
--- a/isis/src/qisis/objs/TargetBody/TargetBody.h
+++ b/isis/src/qisis/objs/TargetBody/TargetBody.h
@@ -1,28 +1,13 @@
 #ifndef TargetBody_h
 #define TargetBody_h
 
-/**
- * @file
- * $Revision: 1.20 $
- * $Date: 2009/10/15 01:35:17 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <vector>
 
@@ -60,7 +45,7 @@ namespace Isis {
    * This class represents a target body in a project-based GUI interface. It encapsulates ideas
    *   about a target such as it's display name, how it should be viewed, where it is on disk, etc.
    *
-   *  
+   *
    * @ingroup qisis
    *
    * @author 2015-06-08 Ken Edmundson
@@ -72,10 +57,10 @@ namespace Isis {
    *   @history 2016-06-13 Tyler Wilson - Added new documentation and corrected
    *                          formatting to be consisten with ISIS3 coding standards.
    *                          Fixes #3997 and #4018.
-   *   @hitsory 2018-07-12 Summer Stapleton - Added m_targetName and targetName() in order to 
-   *                           collect the TargetName from the original cube label for 
+   *   @hitsory 2018-07-12 Summer Stapleton - Added m_targetName and targetName() in order to
+   *                           collect the TargetName from the original cube label for
    *                           comparisons related to image imports in ipce. References #5460.
-   *  
+   *
    */
   class TargetBody : public QObject {
 
@@ -171,7 +156,7 @@ namespace Isis {
        *   when saving to disk).
        */
       QUuid *m_id;
-      
+
       /**
        * The TargetName as it appears in the original cube.
        */
diff --git a/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h b/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h
index fc83976baed73c2d33ccf5ec8d8e95abf6b84072..c31810d687d4a0fd8ba09579b304680c7de2d437 100644
--- a/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h
+++ b/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h
@@ -1,27 +1,13 @@
 #ifndef TargetBodyDisplayProperties_H
 #define TargetBodyDisplayProperties_H
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2012/06/12 06:30:00 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QColor> // This is required since QColor is in a slot
 #include <QMetaType> // required since we're adding to QVariant
diff --git a/isis/src/qisis/objs/TargetBodyList/TargetBodyList.cpp b/isis/src/qisis/objs/TargetBodyList/TargetBodyList.cpp
index b113cd946afac1fd0181b9304a1877e66e47b49c..925dcb794f3c87c1c0fdbf17fb5cfa81e323fb88 100644
--- a/isis/src/qisis/objs/TargetBodyList/TargetBodyList.cpp
+++ b/isis/src/qisis/objs/TargetBodyList/TargetBodyList.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "TargetBodyList.h"
 
 //#include <QAction>
@@ -125,9 +111,9 @@ namespace Isis {
 
   /**
    * Appends a TargetBody to the list.
-   * 
+   *
    * @param value The TargetBody to append
-   * 
+   *
    * @see QList<TargetBodyQsp>::append()
    */
   void TargetBodyList::append(TargetBodyQsp const &value) {
@@ -138,9 +124,9 @@ namespace Isis {
 
   /**
    * Appends a TargetBodyList to the list.
-   * 
+   *
    * @param value the TargetBodyList to append
-   * 
+   *
    * @see QList<TargetBodyQsp>::append()
    */
   void TargetBodyList::append(const QList<TargetBodyQsp> &value) {
@@ -151,7 +137,7 @@ namespace Isis {
 
   /**
    * clears the list.
-   * 
+   *
    * @see QList<TargetBodyQsp>::clear()
    */
   void TargetBodyList::clear() {
@@ -165,9 +151,9 @@ namespace Isis {
 
   /**
    * Erases the TargetBody associated with an iterator.
-   * 
+   *
    * @param pos An iterator associated with the TaretBody to be erased
-   * 
+   *
    * @see QList<TargetBodyQsp>::erase()
    */
   QList<TargetBodyQsp>::iterator TargetBodyList::erase(iterator pos) {
@@ -180,13 +166,13 @@ namespace Isis {
   /**
    * Erases all TargetBodies starting with the TargetBody associated with begin up to,
    * but not including, the TargetBody associated with end.
-   * 
+   *
    * @param begin An iterator associated with the first TargetBody to be erased.
    * @param end An iterator associated with the TargetBody after the last TargetBody to be erased
-   * 
+   *
    * @return @b QList<TargetBodyQsp>::iterator An iterator associated with the TargetBody
    *                                               end was associated with before erasing.
-   * 
+   *
    * @see QList<TargetBodyQsp>::erase()
    */
   QList<TargetBodyQsp>::iterator TargetBodyList::erase(iterator begin, iterator end) {
@@ -198,10 +184,10 @@ namespace Isis {
 
   /**
    * Inserts a TargetBody at a specific index.
-   * 
+   *
    * @param i The index at which to insert the TargetBody
    * @param value The TargetBody to insert
-   * 
+   *
    * @see QList<TargetBodyQsp>::insert()
    */
   void TargetBodyList::insert(int i, TargetBodyQsp const &value) {
@@ -213,13 +199,13 @@ namespace Isis {
 
   /**
    * Inserts a TargetBody after the TargetBody associated with an iterator.
-   * 
+   *
    * @param before An iterator associated with the TargetBody that will be before
    *                   the inserted TargetBody
    * @param value The TargetBody to be inserted
-   * 
+   *
    * @return @b QList<TargetBodyQsp>::iterator An iterator associated with the inserted TargetBody
-   * 
+   *
    * @see QList<TargetBodyQsp>::insert()
    */
   QList<TargetBodyQsp>::iterator TargetBodyList::insert(iterator before, TargetBodyQsp const &value) {
@@ -231,9 +217,9 @@ namespace Isis {
 
   /**
    * Inserts a TargetBody at the front of the list
-   * 
+   *
    * @param value the TargetBody to be inserted
-   * 
+   *
    * @see QList<TargetBodyQsp>::prepend()
    */
   void TargetBodyList::prepend(TargetBodyQsp const &value) {
@@ -244,9 +230,9 @@ namespace Isis {
 
   /**
    * Appends a TargetBody to the end of the list
-   * 
+   *
    * @param value The TargetBody to be append
-   * 
+   *
    * @see QList<TargetBodyQsp>::push_back()
    */
   void TargetBodyList::push_back(TargetBodyQsp const &value) {
@@ -257,9 +243,9 @@ namespace Isis {
 
   /**
    * Insertes a TargetBody at the front of the list
-   * 
+   *
    * @param value The TargetBody to be prepend
-   * 
+   *
    * @see QList<TargetBodyQsp>::push_front()
    */
   void TargetBodyList::push_front(TargetBodyQsp const &value) {
@@ -270,11 +256,11 @@ namespace Isis {
 
   /**
    * Removes all occurrences of a TargetBody and returns the number removed.
-   * 
+   *
    * @param value The TargetBody to be removed.
-   * 
+   *
    * @return @b int The Number of TargetBodies removed.
-   * 
+   *
    * @see QList<TargetBodyQsp>::removeAll()
    */
   int TargetBodyList::removeAll(TargetBodyQsp const &value) {
@@ -290,9 +276,9 @@ namespace Isis {
 
   /**
    * Removes the TargetBody at a specific index.
-   * 
+   *
    * @param i The index of the TargetBody to be removed
-   * 
+   *
    * @see QList<TargetBodyQsp>::removeAt()
    */
   void TargetBodyList::removeAt(int i) {
@@ -303,7 +289,7 @@ namespace Isis {
 
   /**
    * Removes the first TargetBody from the list.
-   * 
+   *
    * @see QList<TargetBodyQsp>::removeFirst()
    */
   void TargetBodyList::removeFirst() {
@@ -314,7 +300,7 @@ namespace Isis {
 
   /**
    * Removes the last TargetBody from the list.
-   * 
+   *
    * @see QList<TargetBodyQsp>::removeLast()
    */
   void TargetBodyList::removeLast() {
@@ -325,11 +311,11 @@ namespace Isis {
 
   /**
    * Removes the first occurrence of a TargetBody from the list.
-   * 
+   *
    * @param value the TargetBody to be removed
-   * 
+   *
    * @return @b bool If the removal was successful
-   * 
+   *
    * @see QList<TargetBodyQsp>::removeOne()
    */
   bool TargetBodyList::removeOne(TargetBodyQsp const &value) {
@@ -345,9 +331,9 @@ namespace Isis {
 
   /**
    * Swaps the list with another TargetBodyList.
-   * 
+   *
    * @param other The TargetBodyList to swap with
-   * 
+   *
    * @see QList<TargetBodyQsp>::swap()
    */
   void TargetBodyList::swap(QList<TargetBodyQsp> &other) {
@@ -361,11 +347,11 @@ namespace Isis {
 
   /**
    * Removes and returns the TargetBody at a specific index.
-   * 
+   *
    * @param i The index of the TargetBody to takeAt
-   * 
+   *
    * @return @b TargetBodyQsp The removed TargetBody
-   * 
+   *
    * @see QList<TargetBodyQsp>::takeAt()
    */
   TargetBodyQsp TargetBodyList::takeAt(int i) {
@@ -377,9 +363,9 @@ namespace Isis {
 
   /**
    * Removes and returns the first TargetBody in the list.
-   * 
+   *
    * @return @b TargetBodyQsp The first TargetBody in the list
-   * 
+   *
    * @see QList<TargetBodyQsp>::takeFirst()
    */
   TargetBodyQsp TargetBodyList::takeFirst() {
@@ -391,9 +377,9 @@ namespace Isis {
 
   /**
    * Removes and returns the last TargetBody in the list.
-   * 
+   *
    * @return @b TargetBodyQsp The last TargetBody in the list.
-   * 
+   *
    * @see QList<TargetBodyQsp>::takeLast()
    */
   TargetBodyQsp TargetBodyList::takeLast() {
@@ -405,11 +391,11 @@ namespace Isis {
 
   /**
    * Appends another TargetBodyList to the list.
-   * 
+   *
    * @param other The TargetBodyList to be appended
-   * 
+   *
    * @return @b TargetBodyList & A reference to this list.
-   * 
+   *
    * @see QList<TargetBodyQsp>::operator+=()
    */
   TargetBodyList &TargetBodyList::operator+=(const QList<TargetBodyQsp> &other) {
@@ -425,11 +411,11 @@ namespace Isis {
 
   /**
    * Appends a TargetBody to the list.
-   * 
+   *
    * @param other The TargetBody to be appended
-   * 
+   *
    * @return @b TargetBodyList & A reference to this list.
-   * 
+   *
    * @see QList<TargetBodyQsp>::operator+=()
    */
   TargetBodyList &TargetBodyList::operator+=(TargetBodyQsp const &other) {
@@ -441,11 +427,11 @@ namespace Isis {
 
   /**
    * Appends another TargetBodyList to the list.
-   * 
+   *
    * @param other The TargetBodyList to be appended
-   * 
+   *
    * @return @b TargetBodyList & A reference to this list.
-   * 
+   *
    * @see QList<TargetBodyQsp>::operator<<()
    */
   TargetBodyList &TargetBodyList::operator<<(const QList<TargetBodyQsp> &other) {
@@ -461,11 +447,11 @@ namespace Isis {
 
   /**
    * Appends a TargetBody to the list.
-   * 
+   *
    * @param other The TargetBody to be appended
-   * 
+   *
    * @return @b TargetBodyList & A reference to this list.
-   * 
+   *
    * @see QList<TargetBodyQsp>::operator<<()
    */
   TargetBodyList &TargetBodyList::operator<<(TargetBodyQsp const &other) {
@@ -477,11 +463,11 @@ namespace Isis {
 
   /**
    * Assignment operator for a QList of TargetBodyQsp
-   * 
+   *
    * @param rhs The right hand side of the '=' operator
-   * 
+   *
    * @return @b TargetBodyList & A reference to this list
-   * 
+   *
    * @see QList<TargetBodyQsp>::operator=()
    */
   TargetBodyList &TargetBodyList::operator=(const QList<TargetBodyQsp> &rhs) {
@@ -500,7 +486,7 @@ namespace Isis {
    * Assignment operator
    *
    * @param rhs The right hand side of the '=' operator
-   * 
+   *
    * @return @b TargetBodyList & A reference to this list
    */
   TargetBodyList &TargetBodyList::operator=(const TargetBodyList &rhs) {
@@ -732,7 +718,7 @@ namespace Isis {
    *     ...
    *   </targets>
    * </pre>
-   * 
+   *
    * @param stream The QXmlStreamWriter that will be used to convert the TargetBodyList
    * @param project The Project the TargetBodyList belongs to
    * @param newProjectRoot The root of the project folder where the TargetBodyList will be saved
@@ -882,7 +868,7 @@ namespace Isis {
   /**
    * Handle an XML start element. This expects <TargetBodyList/> and <target/> elements
    *   (it reads both the project XML and the targets.xml file).
-   * 
+   *
    * @param namespaceURI ???
    * @param localName The name of the element the XmlReader is at
    * @param qName ???
@@ -921,13 +907,13 @@ namespace Isis {
   /**
    * Handle an XML end element. This handles <TargetBodyList /> by opening and reading the
    *   images.xml file.
-   * 
+   *
    * @param namespaceURI ???
    * @param localName The name of the element the XmlReader is at
    * @param qName ???
    *
    * @return @b bool If we should continue reading the XML (usually true).
-   * 
+   *
    * @throws IException::Io "Unable to open with read access"
    * @throws IException::Io "Failed to open target body list XML"
    */
@@ -941,7 +927,7 @@ namespace Isis {
       reader.pushContentHandler(&handler);
       reader.setErrorHandler(&handler);
 
-      QString TargetBodyListXmlPath = m_project->targetBodyRoot() + "/" + 
+      QString TargetBodyListXmlPath = m_project->targetBodyRoot() + "/" +
                                 m_TargetBodyList->path() + "/targets.xml";
       QFile file(TargetBodyListXmlPath);
 
diff --git a/isis/src/qisis/objs/Template/Template.h b/isis/src/qisis/objs/Template/Template.h
index cebd8946b63f4e83e00931fd276a22a6c86de13e..c2cf11ce4dfe6fcf835c59e82e7fa868d6f9997a 100755
--- a/isis/src/qisis/objs/Template/Template.h
+++ b/isis/src/qisis/objs/Template/Template.h
@@ -1,27 +1,13 @@
 #ifndef Template_H
 #define Template_H
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
  #include <QObject>
  #include <QString>
@@ -34,7 +20,7 @@
    class FileName;
    class Project;
 
-   /**   
+   /**
     * @author 2017-11-01 Christopher Combs
     * @internal
     *   @history 2017-11-01 Christopher Combs -  This represents an ISIS template in a
@@ -60,7 +46,7 @@
      void updateFileName(Project * project);
 
    private:
-     /**     
+     /**
       * @author ????-??-?? Steven Lambright
       *
       * @internal
diff --git a/isis/src/qisis/objs/TemplateList/TemplateList.cpp b/isis/src/qisis/objs/TemplateList/TemplateList.cpp
index c0f9b41946fabda4e7e15ed0c37a207bc38181f6..1ab10e3f479d63f2a54b7013c54314bff898dd91 100755
--- a/isis/src/qisis/objs/TemplateList/TemplateList.cpp
+++ b/isis/src/qisis/objs/TemplateList/TemplateList.cpp
@@ -1,25 +1,10 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "TemplateList.h"
 #include <QDir>
@@ -43,8 +28,8 @@ namespace Isis {
     m_path = path;
     m_type = type;
   }
-  
-  
+
+
   /**
    * Creates a blank template list.
    *
@@ -194,7 +179,7 @@ namespace Isis {
    */
   void TemplateList::save(QXmlStreamWriter &stream, const Project *project, FileName newProjectRoot)
       const {
-    
+
     if (m_type == "maps") {
       stream.writeStartElement("mapTemplateList");
     }
@@ -210,7 +195,7 @@ namespace Isis {
     stream.writeAttribute("type", m_type);
     stream.writeAttribute("path", m_path);
 
-    FileName settingsFileName(Project::templateRoot(newProjectRoot.toString()) 
+    FileName settingsFileName(Project::templateRoot(newProjectRoot.toString())
                               + "/" + m_type + "/" + m_name + "/templates.xml");
 
     if (!settingsFileName.dir().mkpath(settingsFileName.path())) {
@@ -292,7 +277,7 @@ namespace Isis {
         if (!type.isEmpty()) {
           m_templateList->setType(type);
         }
-        
+
         if (!path.isEmpty()) {
           m_templateList->setPath(path);
         }
@@ -328,10 +313,10 @@ namespace Isis {
       reader.pushContentHandler(&handler);
       reader.setErrorHandler(&handler);
 
-      QString templateListXmlPath = m_project->templateRoot() + "/" + m_templateList->type() + "/" 
+      QString templateListXmlPath = m_project->templateRoot() + "/" + m_templateList->type() + "/"
                                     + m_templateList->name() + "/templates.xml";
       templateListXmlPath = QDir::cleanPath(templateListXmlPath);
-      
+
       QFile file(templateListXmlPath);
 
       if (!file.open(QFile::ReadOnly)) {
diff --git a/isis/src/qisis/objs/TemplateList/TemplateList.h b/isis/src/qisis/objs/TemplateList/TemplateList.h
index 71bd34927d1a54ecbd0dd323efd65f83ee38c711..1f7cdafe352f4e57ad979d9eedf5dfe452851d2d 100755
--- a/isis/src/qisis/objs/TemplateList/TemplateList.h
+++ b/isis/src/qisis/objs/TemplateList/TemplateList.h
@@ -1,27 +1,13 @@
 #ifndef TemplateList_H
 #define TemplateList_H
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QDebug>
 #include <QList>
@@ -34,7 +20,7 @@
 
  namespace Isis {
 
-   /**    
+   /**
     *
     * @author 2017-11-01 Christopher Combs
     *
@@ -42,7 +28,7 @@
     *   @history 2017-11-01 Christopher Combs - Maintains a list of Templates so that templates
     *                           can easily be copied from one Project to another, saved to disk, or
     *                           deleted from disk. Adapted from ControlList.
-    *   @history 2018-07-07 Summer Stapleton - Fixed a few errors in how the xmlhandling was 
+    *   @history 2018-07-07 Summer Stapleton - Fixed a few errors in how the xmlhandling was
     *                           occuring and added additional handling of separating map templates
     *                           from registration templates to reflect chagnes in Project.cpp.
     */
diff --git a/isis/src/qisis/objs/Tool/Tool.h b/isis/src/qisis/objs/Tool/Tool.h
index a56fcc4b571ec52a513eb46c8f2bc454fed11a9f..9433d509b8666fe0c15afc855e40868b44c550aa 100644
--- a/isis/src/qisis/objs/Tool/Tool.h
+++ b/isis/src/qisis/objs/Tool/Tool.h
@@ -1,27 +1,13 @@
 #ifndef Tool_h
 #define Tool_h
 
-/**
- * @file
- * $Date: 2010/07/01 22:52:23 $
- * $Revision: 1.21 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 
 #include <QObject>
diff --git a/isis/src/qisis/objs/ToolList/ToolList.h b/isis/src/qisis/objs/ToolList/ToolList.h
index 43aebb1baac35373df448d67f4e07b78185f1840..0c82f243877d8f6eab8c699a4a76abd419cc9cb7 100644
--- a/isis/src/qisis/objs/ToolList/ToolList.h
+++ b/isis/src/qisis/objs/ToolList/ToolList.h
@@ -1,27 +1,13 @@
 #ifndef ToolList_h
 #define ToolList_h
 
-/**
- * @file
- * $Date: 2010/07/01 22:52:23 $
- * $Revision: 1.21 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include <QList>
 
diff --git a/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.cpp b/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.cpp
index a361743839df70c4c6519e8aa1a844d4306ff79b..53f952ebca00150d00942f4be3441cc5f9385838 100644
--- a/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.cpp
+++ b/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.cpp
@@ -1,34 +1,20 @@
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "ViewSubWindow.h"
 
 namespace Isis {
-    
+
   /**
    * Constructs a ViewSubWindow object
    */
   ViewSubWindow::ViewSubWindow(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) {
-    
+
   }
 
 
@@ -36,7 +22,7 @@ namespace Isis {
    *  Destructor
    */
   ViewSubWindow::~ViewSubWindow() {
-      
+
   }
 
 
@@ -51,4 +37,3 @@ namespace Isis {
     QMainWindow::closeEvent(event);
   }
 }
-
diff --git a/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.h b/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.h
index 6ab67388f7ffa3439dfd3fdb6f00d248dbe03877..a63a207a124c98eca206aa41da3f0b42ffdfee1e 100644
--- a/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.h
+++ b/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.h
@@ -1,27 +1,14 @@
 #ifndef ViewSubWindow_h
 #define ViewSubWindow_h
-/**
- * @file
- * $Date$
- * $Revision$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QMainWindow>
 
 namespace Isis {
@@ -29,7 +16,7 @@ namespace Isis {
   /**
    * @brief This class exists to contain detached views from ipce.
    *          the purpose is for it to emit the closeWindow() signal
-   *          so that we can track when detached windows are closed. 
+   *          so that we can track when detached windows are closed.
    *
    * @ingroup Visualization Tools
    *
@@ -37,7 +24,7 @@ namespace Isis {
    *
    * @internal
    *
-   *  @history 2017-10-25 Adam Goins - This class created. 
+   *  @history 2017-10-25 Adam Goins - This class created.
    */
   class ViewSubWindow : public QMainWindow {
       Q_OBJECT
diff --git a/isis/src/qisis/objs/WarningWidget/WarningWidget.h b/isis/src/qisis/objs/WarningWidget/WarningWidget.h
index bf01bdaf04df1a1a58a20a03fc3b3e979625ee11..af7cd6df1e0b4f2a8cb6def81804b21bf80132c3 100644
--- a/isis/src/qisis/objs/WarningWidget/WarningWidget.h
+++ b/isis/src/qisis/objs/WarningWidget/WarningWidget.h
@@ -1,6 +1,14 @@
 #ifndef _WarningWidget_h_
 #define _WarningWidget_h_
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QToolButton>
 #include <QAction>
 #include <QDialog>
@@ -9,27 +17,6 @@
 #include <QTextEdit>
 
 #include "CubeViewport.h"
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2010/06/24 17:17:49 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
 
 namespace Isis {
   /**
diff --git a/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp b/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp
index 8050613fc84a98ffcb88b233c41c4aea35e91a9e..58bc203a7aa2954a3144192e94b663f8ee8ceb3e 100644
--- a/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp
+++ b/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "IsisDebug.h"
 
 #include "WorkOrder.h"
diff --git a/isis/src/qisis/objs/WorkOrder/WorkOrder.h b/isis/src/qisis/objs/WorkOrder/WorkOrder.h
index 1e391fa658d2b7bf36cd02d93cb5b524bc082de1..97d40b395ea45623922c0f24626df048a2575dfc 100644
--- a/isis/src/qisis/objs/WorkOrder/WorkOrder.h
+++ b/isis/src/qisis/objs/WorkOrder/WorkOrder.h
@@ -1,25 +1,14 @@
 #ifndef WorkOrder_H
 #define WorkOrder_H
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QAction>
 #include <QDateTime>
@@ -314,8 +303,8 @@ namespace Isis {
    *                           a private QString object called m_data.  References #4492.
    *   @history 2017-12-05 Christopher Combs - Added support for TemplateEditorWidget and
    *                           TemplateEditViewWorkOrder. Fixes #5168.
-   *   @history 2018-06-28 Makayla Shepherd - Removed the ProgressBar cleanup because it was 
-   *                           causing a seg fault when the ProgressBar was added to the 
+   *   @history 2018-06-28 Makayla Shepherd - Removed the ProgressBar cleanup because it was
+   *                           causing a seg fault when the ProgressBar was added to the
    *                           HistoryTreeWidget. The HistoryTreeWidget will now clean up the
    *                           ProgressBar. Fixes #5228.
    */
diff --git a/isis/src/qisis/objs/WorkOrder/WorkOrderFactory.h b/isis/src/qisis/objs/WorkOrder/WorkOrderFactory.h
index 06745a76657f2ba1591d961ff81d9f000bed45dc..6b3570c0f81a241b142b4c525429a4a62d678a32 100644
--- a/isis/src/qisis/objs/WorkOrder/WorkOrderFactory.h
+++ b/isis/src/qisis/objs/WorkOrder/WorkOrderFactory.h
@@ -1,27 +1,14 @@
 #ifndef WorkOrderFactory_H
 #define WorkOrderFactory_H
-/**
- * @file
- * $Revision: 1.19 $
- * $Date: 2010/03/22 19:44:53 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QObject>
 
@@ -59,7 +46,7 @@ namespace Isis {
    *                              class.  Fixes #5220.
    *   @history 2018-06-18 Adam Goins - Added ControlHealthMonitorWorkOrder to WorkOrderFactory.
    *                           Fixes #5435.
-   *   @history 2018-07-07 Summer Stapleton - Removed importTemplateWorkOrder and replaced it with 
+   *   @history 2018-07-07 Summer Stapleton - Removed importTemplateWorkOrder and replaced it with
    *                           the new map and registration import work orders to reflect changes
    *                           in Project.cpp for handling these differently.
    */
diff --git a/isis/src/qisis/objs/Workspace/Workspace.h b/isis/src/qisis/objs/Workspace/Workspace.h
index 054fdddbc9365809d55111e4e925433765b322e5..133250848530f7b70ba97b242f19b62371c1788b 100644
--- a/isis/src/qisis/objs/Workspace/Workspace.h
+++ b/isis/src/qisis/objs/Workspace/Workspace.h
@@ -1,26 +1,14 @@
 #ifndef Workspace_h
 #define Workspace_h
-/**
- * @file
- * $Revision: 1.9 $
- * $Date: 2010/06/28 08:36:36 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 
 #include <QMdiArea>
diff --git a/isis/src/qisis/objs/ZoomTool/ZoomTool.cpp b/isis/src/qisis/objs/ZoomTool/ZoomTool.cpp
index 255915bd7ba501051c4f9bde442de80ccaf92727..cc0cb17c426bea9e18833c3d67702faf30bfa20d 100644
--- a/isis/src/qisis/objs/ZoomTool/ZoomTool.cpp
+++ b/isis/src/qisis/objs/ZoomTool/ZoomTool.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- * $Date: 2010/06/28 09:24:10 $
- * $Revision: 1.9 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iostream>
 
 #include <QAction>
diff --git a/isis/src/qisis/objs/ZoomTool/ZoomTool.h b/isis/src/qisis/objs/ZoomTool/ZoomTool.h
index d81bbdcdc99f938ac9adfa6fb9ab36f14f805e9b..e87b17feaa978cfd136a4bd7c50abbffc277e3e1 100644
--- a/isis/src/qisis/objs/ZoomTool/ZoomTool.h
+++ b/isis/src/qisis/objs/ZoomTool/ZoomTool.h
@@ -1,25 +1,14 @@
 #ifndef ZoomTool_h
 #define ZoomTool_h
 
-/**
- * @file
- * $Date: 2010/06/28 09:24:10 $
- * $Revision: 1.7 $
- *
- *  Unless noted otherwise, the portions of Isis written by the USGS are public domain. See
- *  individual third-party library and package descriptions for intellectual property information,
- *  user agreements, and related information.
- *
- *  Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the
- *  USGS as to the accuracy and functioning of such software and related material nor shall the
- *  fact of distribution constitute any such warranty, and no responsibility is assumed by the
- *  USGS in connection therewith.
- *
- *  For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *  in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *  http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *  http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 
 // This should be the only include in this file!
@@ -62,7 +51,7 @@ namespace Isis {
    *                           method did nothing so I removed that too. Zooming
    *                           happens on the rubberBandComplete slot.
    *  @history 2017-05-10 Ian Humphrey - Modified zoomFit() so that when doing a "Fit in viewport"
-   *                          zoom, the image is centered properly in the viewport. Fixes #4756. 
+   *                          zoom, the image is centered properly in the viewport. Fixes #4756.
    */
   class ZoomTool : public Tool {
       Q_OBJECT
diff --git a/isis/src/rolo/apps/rolo2isis/main.cpp b/isis/src/rolo/apps/rolo2isis/main.cpp
index 3ab213af6cbb43a2149361347599970e9d8bfe73..4943b003cbe6fafe6c29eeed8f513c6b5ec24b09 100644
--- a/isis/src/rolo/apps/rolo2isis/main.cpp
+++ b/isis/src/rolo/apps/rolo2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessImportPds.h"
 #include "UserInterface.h"
diff --git a/isis/src/rosetta/apps/rososiris2isis/main.cpp b/isis/src/rosetta/apps/rososiris2isis/main.cpp
index 2b61426c84bd2b760e4f16f5b20878fa20027ade..380a10da7fc8cf0a42f183453b740eeeb107a275 100644
--- a/isis/src/rosetta/apps/rososiris2isis/main.cpp
+++ b/isis/src/rosetta/apps/rososiris2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QDebug>
@@ -41,8 +49,8 @@ void IsisMain() {
 
   instId = instId.simplified().trimmed();
   missionId = missionId.simplified().trimmed();
-  if (missionId.compare("ROSETTA", Qt::CaseInsensitive) != 0 
-     && instId.compare("OSINAC", Qt::CaseInsensitive) != 0 
+  if (missionId.compare("ROSETTA", Qt::CaseInsensitive) != 0
+     && instId.compare("OSINAC", Qt::CaseInsensitive) != 0
      && instId.compare("OSIWAC", Qt::CaseInsensitive) != 0) {
     QString msg = "Input file [" + inFile.expanded() + "] does not appear to be " +
                   "a Rosetta OSIRIS Wide Angle Camera (WAC) or Narrow Angle Camera (NAC) file.";
@@ -96,7 +104,7 @@ void IsisMain() {
 
   // Set the BandBin filter name, center, and width values based on the
   // FilterNumber.  Note OSIRIS has 2 filter wheels, so information
-  // must be looked up and stored for both.  
+  // must be looked up and stored for both.
   PvlGroup &bbGrp(outLabel.findGroup("BandBin", Pvl::Traverse));
   PvlGroup groupWithFilterInfo=pdsLabel.findGroup("SR_MECHANISM_STATUS");
   QString combFilterName = groupWithFilterInfo["FILTER_NAME"];
@@ -107,24 +115,24 @@ void IsisMain() {
   vector<double> filterWidths(2,0.0);
   vector<double> filterCenters(2,0.0);
 
-  // OSIRIS NAC and WAC have different filters 
+  // OSIRIS NAC and WAC have different filters
   for (int i = 0; i < filterNames.size(); i++) {
     // Translate the Instrument group
     try {
       transFile = transDir + "RosettaOsirisFilters.trn";
       PvlTranslationTable filterTable(transFile.expanded());
-      filterCenters[i] = toDouble(filterTable.Translate("FilterCenter_" + instId, 
+      filterCenters[i] = toDouble(filterTable.Translate("FilterCenter_" + instId,
                                                         filterNames[i]));
-      filterWidths[i] = toDouble(filterTable.Translate("FilterWidth_" + instId, 
+      filterWidths[i] = toDouble(filterTable.Translate("FilterWidth_" + instId,
                                                        filterNames[i]));
     }
     catch (IException &e) {
-      QString msg = "Input file [" + inFile.expanded() 
+      QString msg = "Input file [" + inFile.expanded()
                     + "] appears invalid. "
-                    + "FilterName [" 
-                    + filterNames[i] 
+                    + "FilterName ["
+                    + filterNames[i]
                     + "] for instrument ["
-                    + instId 
+                    + instId
                     + "] not found in ["
                     + transFile.expanded() + "].";
       throw IException(e, IException::Io, msg, _FILEINFO_);
diff --git a/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.cpp b/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.cpp
index 4164d8f87bea94d01844c08496817df5cd26e419..b3aeb34bd741d8f932beadf4922003275128a32b 100644
--- a/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.cpp
+++ b/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.cpp
@@ -1,22 +1,10 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
 
 #include "VirtisHK.h"
 
@@ -25,7 +13,7 @@ namespace Isis {
 
 /**
  * Constructs a VIRTIS HK object.
- * 
+ *
  * @param hkName Name to be used for the housekeeping data
  * @param tableType The type the data is (double, int)
  * @param one first conversion coefficient
@@ -33,7 +21,7 @@ namespace Isis {
  * @param three third conversion coefficient
  */
  VirtisHK::VirtisHK(QString hkName, QString tableType, QString one, QString two, QString three) {
-    m_name = hkName; 
+    m_name = hkName;
 
     if (QString::compare(tableType.trimmed(), "double") == 0) {
       m_tableType = TableField::Double;
@@ -42,7 +30,7 @@ namespace Isis {
       m_tableType = TableField::Integer;
     }
 
-    // Initialize equation 
+    // Initialize equation
     one = one.remove("{").trimmed();
     three = three.remove("}").trimmed();
 
@@ -54,14 +42,14 @@ namespace Isis {
 
  /**
  * Default destructor
- * 
+ *
  */
   VirtisHK::~VirtisHK() {}
 
 
 /**
  * The name of the HK.
- * 
+ *
  * @return QString The name of the HK.
  */
   QString VirtisHK::name(){
@@ -71,7 +59,7 @@ namespace Isis {
 
 /**
  * Returns the TableField Type for this HK.
- * 
+ *
  * @return TableField::Type The field type for this HK.
  */
   TableField::Type VirtisHK::tableType(){
@@ -81,7 +69,7 @@ namespace Isis {
 
 /**
  * Creates and returns the appropriate TableField for this HK.
- * 
+ *
  * @return TableField The entire appropriate TableField for this HK
  */
   TableField VirtisHK::tableField(){
@@ -90,8 +78,8 @@ namespace Isis {
 
 
 /**
- * Returns the coefficients used to convert the HK to physical units. 
- * 
+ * Returns the coefficients used to convert the HK to physical units.
+ *
  * @return std::vector<double> A vector of coefficients used to convert this HK to physical units
  */
   std::vector<double> VirtisHK::coefficients(){
diff --git a/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.h b/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.h
index b8d548ae3090da25213e47c4fc0d2837d82242c7..2218219ce46b2dc31bba937290a45fdfe22e10dd 100644
--- a/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.h
+++ b/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.h
@@ -1,24 +1,14 @@
 #ifndef VirtisHK_h
 #define VirtisHK_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QString>
 
@@ -27,17 +17,17 @@
 namespace Isis {
 /**
  * Represents a Rosetta Virtis Housekeeping (HK) entry.
- * 
- * @author 2017-05-27 Kristin Berry 
- *  
- * @internal 
+ *
+ * @author 2017-05-27 Kristin Berry
+ *
+ * @internal
  * @history 2017-05-27 Kristin Berry - Original Version
  */
   class VirtisHK {
     public:
 
       VirtisHK(QString hkName, QString tableType, QString one, QString two, QString three);
-      ~VirtisHK(); 
+      ~VirtisHK();
 
       QString name();
       TableField::Type tableType();
diff --git a/isis/src/rosetta/apps/rosvirtis2isis/main.cpp b/isis/src/rosetta/apps/rosvirtis2isis/main.cpp
index 1d0e9cddce433efd1aa26f17a23e156b02bf6193..8c9c2c24eebd38d285065fbb947ebf62bbb9461b 100644
--- a/isis/src/rosetta/apps/rosvirtis2isis/main.cpp
+++ b/isis/src/rosetta/apps/rosvirtis2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <iostream>
@@ -30,7 +38,7 @@ int word(const char byte1, const char byte2);
 int swapb(const unsigned short int word);
 double translateScet(int word1, int word2, int word3);
 bool isValid(int word);
-QString convertSCET(int word1, int word2, int word3); 
+QString convertSCET(int word1, int word2, int word3);
 
 void IsisMain ()
 {
@@ -68,7 +76,7 @@ void IsisMain ()
 
   // only save data suffix if proclevel = 3
   if (procLevel == 3) {
-    p.SaveDataSuffix(); 
+    p.SaveDataSuffix();
   }
 
   // NULL pixels are set to 65535 in the input QUB
@@ -112,7 +120,7 @@ void IsisMain ()
   }
 
   QString startScet;
-  QString stopScet; 
+  QString stopScet;
 
   p.StartProcess();
 
@@ -352,26 +360,26 @@ void IsisMain ()
     for (unsigned int i=0; i < dataSuffix.size(); i++) {
       std::vector<char*> dataSuffixRecord = dataSuffix[i];
 
-      // The SCET for each line is stored as three 2-byte words. The three words are stored in the 
-      // second byte of each of the first 3 lines of the suffix record. 
-      std::vector<const unsigned short*> scetBytes; 
-      std::vector<int> scetWords; 
+      // The SCET for each line is stored as three 2-byte words. The three words are stored in the
+      // second byte of each of the first 3 lines of the suffix record.
+      std::vector<const unsigned short*> scetBytes;
+      std::vector<int> scetWords;
       for (int j=0; j < 3; j++) {
         scetBytes.push_back(reinterpret_cast<const unsigned short *>(dataSuffixRecord.at(j)));
-        scetWords.push_back(swapb(scetBytes[j][1]));    
+        scetWords.push_back(swapb(scetBytes[j][1]));
       }
-      
+
       // Calculate the SCET and add it to the table
-      QString translatedScet = convertSCET(scetWords[0], scetWords[1], scetWords[2]); 
-      rec[0] = translatedScet; 
-      table += rec; 
+      QString translatedScet = convertSCET(scetWords[0], scetWords[1], scetWords[2]);
+      rec[0] = translatedScet;
+      table += rec;
 
-      // Save off first and last scet values. 
+      // Save off first and last scet values.
       if (i==0) {
-        startScet = translatedScet; 
+        startScet = translatedScet;
       }
       else if (i == dataSuffix.size() - 1) {
-        stopScet = translatedScet; 
+        stopScet = translatedScet;
       }
     }
     outcube->write(table);
@@ -394,18 +402,18 @@ void IsisMain ()
     // Fix the StartTime and SpacecraftStartClockCount in the ISIS label
     PvlGroup &inst = outLabel.findGroup("Instrument", Pvl::Traverse);
 
-    // Pass the Start/Stop SCET values to naif to get the utc time. 
-    QString sclk = "$ISISDATA/rosetta/kernels/sclk/ROS_??????_STEP.TSC"; 
-    QString lsk  = "$ISISDATA/base/kernels/lsk/naif????.tls"; 
+    // Pass the Start/Stop SCET values to naif to get the utc time.
+    QString sclk = "$ISISDATA/rosetta/kernels/sclk/ROS_??????_STEP.TSC";
+    QString lsk  = "$ISISDATA/base/kernels/lsk/naif????.tls";
     FileName sclkName(sclk);
-    FileName lskName(lsk); 
+    FileName lskName(lsk);
 
-    sclkName = sclkName.highestVersion(); 
-    lskName = lskName.highestVersion(); 
+    sclkName = sclkName.highestVersion();
+    lskName = lskName.highestVersion();
 
     furnsh_c(lskName.expanded().toLatin1().data());
     furnsh_c(sclkName.expanded().toLatin1().data());
-    
+
     SpiceDouble etStart;
     SpiceDouble etEnd;
     scs2e_c( (SpiceInt) -226, startScet.toLatin1().data(), &etStart);
@@ -414,19 +422,19 @@ void IsisMain ()
     PvlKeyword &frameParam = inst["FrameParameter"];
     double exposureTime = toDouble(frameParam[0]);
 
-    QString startTime = iTime(etStart-exposureTime).UTC(); 
-    QString stopTime = iTime(etEnd-exposureTime).UTC(); 
+    QString startTime = iTime(etStart-exposureTime).UTC();
+    QString stopTime = iTime(etEnd-exposureTime).UTC();
 
-    SpiceChar startSclkString[50]; 
-    SpiceChar endSclkString[50]; 
+    SpiceChar startSclkString[50];
+    SpiceChar endSclkString[50];
     sce2s_c( (SpiceInt) -226, etStart-exposureTime, (SpiceInt) 50, startSclkString);
     sce2s_c( (SpiceInt) -226, etEnd-exposureTime, (SpiceInt) 50, endSclkString);
-    
+
     inst.findKeyword("StartTime").setValue(startTime);
-    inst.findKeyword("StopTime").setValue(stopTime); 
+    inst.findKeyword("StopTime").setValue(stopTime);
 
-    inst.findKeyword("SpacecraftClockStartCount").setValue(startSclkString); 
-    inst.findKeyword("SpacecraftClockStopCount").setValue(endSclkString); 
+    inst.findKeyword("SpacecraftClockStartCount").setValue(startSclkString);
+    inst.findKeyword("SpacecraftClockStopCount").setValue(endSclkString);
 
     outcube->putGroup(inst);
 
@@ -434,7 +442,7 @@ void IsisMain ()
     unload_c(lsk.toLatin1().data());
     unload_c(sclk.toLatin1().data());
   }
-  
+
   // Write the Archive and Instrument groups to the output cube label
   outcube->putGroup(outLabel.findGroup("Archive", Pvl::Traverse));
   outcube->putGroup(outLabel.findGroup("Instrument", Pvl::Traverse));
@@ -485,14 +493,14 @@ void IsisMain ()
 QString convertSCET(int word1, int word2, int word3)
 {
   double seconds = (double ((double) word1 * pow(2.0,16.0))) + (double) word2;
-  double fractionalSeconds = (double) word3; 
+  double fractionalSeconds = (double) word3;
   QString scetString = QString::number(seconds, 'f');
   QStringList scetStringList = scetString.split(".");
   // The integer portion
   scetString = scetStringList[0];
   scetString.append(":");
   scetString.append(QString::number(fractionalSeconds));
-  return scetString; 
+  return scetString;
 }
 
 
diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp
index 31d9119f1ca4835fed08832e05ccc4e6da68ca55..9677faf89f8bf0a99a916c50b7914f7b8ddd8f8e 100644
--- a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp
+++ b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "RosettaOsirisCamera.h"
 
@@ -45,8 +34,8 @@ namespace Isis {
    * @author ????-??-?? Stuart Sides
    *
    * @internal
-   *   @history ????-??-?? Stuart Sides - Original version. 
-   *   @history ????-??-?? Sasha Brownsberger 
+   *   @history ????-??-?? Stuart Sides - Original version.
+   *   @history ????-??-?? Sasha Brownsberger
    *   @history 2018-09-24 Kaj Williams - Added binning support.
    */
 
diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.h b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.h
index a0e87569bd52b484cc9c84f03e8c6358378bb774..ebbbc5070043cab7ab10098ac50cd94092a90c7c 100644
--- a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.h
+++ b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.h
@@ -1,24 +1,14 @@
 #ifndef RosettaOsirisCamera_h
 #define RosettaOsirisCamera_h
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FramingCamera.h"
 
diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.cpp b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.cpp
index c8021cf8d704cc5f0a9a27f0667cda949e6141bf..55cc62b24865c0549f96726dc4870dedccb6c500 100644
--- a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.cpp
+++ b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2010/05/12 23:28:12 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "RosettaOsirisCameraDistortionMap.h"
 
@@ -35,7 +21,7 @@ namespace Isis {
    * @param parent the parent camera that will use this distortion map
    *
    */
-  RosettaOsirisCameraDistortionMap::RosettaOsirisCameraDistortionMap(Camera *parent) : 
+  RosettaOsirisCameraDistortionMap::RosettaOsirisCameraDistortionMap(Camera *parent) :
                                                                    CameraDistortionMap(parent) {
     // Initialize to the identity transform
     m_toUnDistortedX = LinearAlgebra::zeroMatrix(4, 4);
@@ -50,23 +36,23 @@ namespace Isis {
 
   /**
    * Compute undistorted focal plane x/y given a distorted focal plane x/y.
-   * 
+   *
    * The distortion is modeled by pixelspace polynomials. The polynomials use
    * zero-based pixel space with the origin at the top left corner of the
    * image, so the input focal plane coordinates are converted to pixel
    * coordinates using the boresight location and pixel pitch. After
    * computation, they are converted back into focal plane coordinates by the
    * inverse process.
-   * 
+   *
    * Given a set of distorted pixel coordinates (dx, dy), the undistorted pixel
    * coordinates (ux, uy) are computed as:
    * @f[ (ux, uy) = F(dx, dy) = ( \sum_{i=0}^3 \sum_{j=0}^3 C_{i,j}^x dx^i dy^j,
    * \sum_{i=0}^3 \sum_{j=0}^3 C_{i,j}^y dx^i dy^j) @f] where @f$ C_{i,j}^y @f$
    * and @f$ C_{i,j}^y @f$ are the @f$ (i,j)^{\text{th}} @f$ coefficients of
    * the @f$ x @f$ and @f$ y @f$ polynomials respectively.
-   * 
+   *
    * This calculation is actually performed as follows:
-   * @f[ (ux, uy) = 
+   * @f[ (ux, uy) =
    * \left( C^x \begin{bmatrix} 1 \\ dx \\ dx^2 \\ dx^3 \end{bmatrix}
    *        \cdot \begin{bmatrix} 1 \\ dy \\ dy^2 \\ dy^3 \end{bmatrix},
    *        C^y \begin{bmatrix} 1 \\ dx \\ dx^2 \\ dx^3 \end{bmatrix}
@@ -115,12 +101,12 @@ namespace Isis {
 
   /**
    * Compute distorted focal plane x/y given an undistorted focal plane x/y.
-   * 
+   *
    * The conversion is performed using Newton's method to find distorted
    * coordinates whose undistorted coordinates are within @f$ 10^{-7} @f$
    * pixels of the input undistorted coordinates. The input undistorted
    * coordinates are used as an initial guess for the distorted coordinates.
-   * 
+   *
    * Given a set of undistorted pixel coordinates (ux, uy), the object function
    * is:
    * @f[
@@ -128,7 +114,7 @@ namespace Isis {
    * @f]
    * where @f$ F @f$ is the transformation from distorted to undistorted pixel
    * coordinates.
-   * 
+   *
    * Then, the negative jacobian is:
    * @f[
    * -J_G(dx, dy) = \begin{bmatrix}
@@ -283,7 +269,7 @@ namespace Isis {
 
   /**
    * Set the matrix for converting from distorted to undistorted samples.
-   * 
+   *
    * @param xMat The conversion matrix
    */
   void RosettaOsirisCameraDistortionMap::setUnDistortedXMatrix(LinearAlgebra::Matrix xMat) {
@@ -293,7 +279,7 @@ namespace Isis {
 
   /**
    * Set the matrix for converting from distorted to undistorted lines.
-   * 
+   *
    * @param yMat The conversion matrix
    */
   void RosettaOsirisCameraDistortionMap::setUnDistortedYMatrix(LinearAlgebra::Matrix yMat) {
@@ -304,7 +290,7 @@ namespace Isis {
   /**
    * Set the boresight location for converting from focal plane coordinates to
    * pixel coordinates.
-   * 
+   *
    * @param sample The sample location of the boresight
    * @param line The line location of the boresight
    */
@@ -317,7 +303,7 @@ namespace Isis {
   /**
    * Set the pixel pitch for converting from focal plane coordinates to
    * pixel coordinates.
-   * 
+   *
    * @param pitch The pixel pitch in mm per pixel.
    */
   void RosettaOsirisCameraDistortionMap::setPixelPitch(double pitch) {
@@ -327,9 +313,9 @@ namespace Isis {
 
   /**
    * Convert a focal plane x coordinate to a pixel space line coordinate.
-   * 
+   *
    * @param x The focal plane x coordinate in mm
-   * 
+   *
    * @return @b double The pixel space line coordinate
    */
   double RosettaOsirisCameraDistortionMap::focalXToLine(double x) {
@@ -339,9 +325,9 @@ namespace Isis {
 
   /**
    * Convert a focal plane y coordinate to a pixel space sample coordinate.
-   * 
+   *
    * @param y The focal plane y coordinate in mm
-   * 
+   *
    * @return @b double The pixel space sample coordinate
    */
   double RosettaOsirisCameraDistortionMap::focalYToSample(double y) {
@@ -351,7 +337,7 @@ namespace Isis {
 
   /**
    * Convert pixel space line coordinate to a focal plane x coordinate.
-   * 
+   *
    * @param line The pixel space line coordinate
    *
    * @return @b double The focal plane x coordinate in mm
@@ -363,7 +349,7 @@ namespace Isis {
 
   /**
    * Convert pixel space sample coordinate to a focal plane y coordinate.
-   * 
+   *
    * @param sample The pixel space sample coordinate
    *
    * @return @b double The focal plane y coordinate in mm
diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.h b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.h
index 4e1cac523d78bcfeb43d378a4f59f4e8b255bde9..823268eb98a4fc94d05c17fa0e8073e75a2f8a22 100644
--- a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.h
+++ b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.h
@@ -1,48 +1,38 @@
 #ifndef RosettaOsirisCameraDistortionMap_h
 #define RosettaOsirisCameraDistortionMap_h
-/** 
- * @file 
- *  
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "CameraDistortionMap.h"
 
 #include "LinearAlgebra.h"
 
 namespace Isis {
-  /** 
+  /**
    * Distortion map for converting between undistorted focal plane and
    * distorted focal plane coordinates for the Rosetta OSIRIS NAC and WAC.
-   * 
+   *
    * The distortion models are defined by pixelspace polynomials. The
    * polynomials use zero-based pixel space with the origin at the top left
    * corner of the image, so the input focal plane coordinates are converted to
    * pixel coordinates using the boresight location and pixel pitch. After
    * computation, they are converted back into focal plane coordinates by the
    * inverse process.
-   * 
+   *
    * Given a set of distorted pixel coordinates (dx, dy), the undistorted pixel
    * coordinates (ux, uy) are computed as:
    * @f[ (ux, uy) = F(dx, dy) = ( \sum_{i=0}^3 \sum_{j=0}^3 C_{i,j}^x dx^i dy^j,
    * \sum_{i=0}^3 \sum_{j=0}^3 C_{i,j}^y dx^i dy^j) @f] where @f$ C_{i,j}^y @f$
    * and @f$ C_{i,j}^y @f$ are the @f$ (i,j)^{\text{th}} @f$ coefficients of
    * the @f$ x @f$ and @f$ y @f$ polynomials respectively.
-   * 
+   *
    * Given a set of undistorted pixel coordinates (ux, uy), Newton's method is
    * used to find the distorted coordinates (dx, dy) within a tolerance of
    * @f$ 10^{-7} @f$ pixels.
@@ -100,4 +90,3 @@ namespace Isis {
   };
 };
 #endif
-
diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/unitTest.cpp b/isis/src/rosetta/objs/RosettaOsirisCamera/unitTest.cpp
index bd8c33b6d8e23e0ca5cbf96e657a1c3558c1819c..964c2112267842b764cdc228c33e02b0df51f9ba 100644
--- a/isis/src/rosetta/objs/RosettaOsirisCamera/unitTest.cpp
+++ b/isis/src/rosetta/objs/RosettaOsirisCamera/unitTest.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
diff --git a/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp b/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp
index 8cf4634dae527018ba9adf311fe113f047ac5c13..85601ae2082ca85c67bd0a04d4f4eaffe7d6252d 100644
--- a/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp
+++ b/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "RosettaVirtisCamera.h"
 
 #include <cctype>
@@ -30,12 +38,12 @@ namespace Isis {
     // constructors
   /**
    * Creates a camera for a Rosetta VIRTIS-M cube
-   * 
+   *
    * @param cube The cube to make a camera for
-   * 
+   *
    */
   RosettaVirtisCamera::RosettaVirtisCamera(Cube &cube) : LineScanCamera(cube) {
-    
+
     m_instrumentNameLong = "Visual and Infrared Thermal Imaging Spectrometer";
     m_instrumentNameShort = "VIRTIS";
     m_spacecraftNameLong = "Rosetta";
@@ -53,7 +61,7 @@ namespace Isis {
                       + instrumentId;
       throw IException(IException::User, mess, _FILEINFO_);
     }
-    
+
 
     int procLevel = inst["ProcessingLevelId"];
     m_is1BCalibrated = (procLevel > 2) ? true : false;
@@ -104,7 +112,7 @@ namespace Isis {
     //  Get the line scan rates/times
 
     if (!m_is1BCalibrated) {
-      readHouseKeeping(lab.fileName(), m_scanRate); 
+      readHouseKeeping(lab.fileName(), m_scanRate);
     }
     else {
       readSCET(lab.fileName());
@@ -131,7 +139,7 @@ namespace Isis {
     // Set initial start time always (label start time is inaccurate)
 
     if (!m_is1BCalibrated){
-      setTime(iTime(startTime())); 
+      setTime(iTime(startTime()));
     }
 
     //  Now check to determine if we have a cache already.  If we have a cache
@@ -171,39 +179,39 @@ namespace Isis {
   RosettaVirtisCamera::~RosettaVirtisCamera() {
   }
 
-  /** 
+  /**
    *  Returns CK frame identifier
-   * 
+   *
    * @return @b int The CK frame identifier.
    */
-  int RosettaVirtisCamera::CkFrameId() const {  
-    return (-226000); 
+  int RosettaVirtisCamera::CkFrameId() const {
+    return (-226000);
   }
 
 
-  /** 
+  /**
    *  Returns CK reference frame identifier
-   * 
+   *
    * @return @b int The CK reference frame identifier.
    */
-  int RosettaVirtisCamera::CkReferenceId() const { 
-    return (1); 
+  int RosettaVirtisCamera::CkReferenceId() const {
+    return (1);
   }
 
 
-  /** 
+  /**
    *  Return PK reference frame identifier
-   * 
+   *
    * @return @b int The SPK reference frame identifier
    */
-  int RosettaVirtisCamera::SpkReferenceId() const { 
-    return (1); 
+  int RosettaVirtisCamera::SpkReferenceId() const {
+    return (1);
   }
 
 
-  /** 
+  /**
    *  Return the pixel summing rate
-   * 
+   *
    * @return @b int The pixel summing rate.
    */
   int RosettaVirtisCamera::pixelSumming() const {
@@ -211,9 +219,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return the exposure time
-   * 
+   *
    * @return @b double The exposure time for a pixel.
    */
   double RosettaVirtisCamera::exposureTime() const {
@@ -221,9 +229,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return the line scan rate
-   * 
+   *
    * @return @b double The time between lines in the cube.
    */
   double RosettaVirtisCamera::scanLineTime() const {
@@ -231,19 +239,19 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return the start time for a given line exposure time
-   * 
+   *
    * @return @b double The et time at the start of the line's exposure.
    */
   double RosettaVirtisCamera::lineStartTime(const double midExpTime) const {
-    return (midExpTime - (exposureTime() / 2.0)); 
+    return (midExpTime - (exposureTime() / 2.0));
   }
 
 
-  /** 
+  /**
    *  Return the end time for a given line exposure time
-   * 
+   *
    * @return @b double The et time at the end of the line's exposure.
    */
   double RosettaVirtisCamera::lineEndTime(const double midExpTime) const {
@@ -251,9 +259,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return start time for the entire cube.
-   * 
+   *
    * @return @b double The et time at the start of the cube.
    */
   double RosettaVirtisCamera::startTime() const {
@@ -261,9 +269,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Return end time for the entire cube.
-   * 
+   *
    * @return @b double The et time at the end of the cube.
    */
   double RosettaVirtisCamera::endTime() const {
@@ -271,9 +279,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    *  Returns number of housekeeping records found in the cube Table
-   * 
+   *
    * @return @b int The number of housekeeping records.
    */
   int RosettaVirtisCamera::hkLineCount() const {
@@ -284,7 +292,7 @@ namespace Isis {
   /**
    * @brief For calibrated VIRTIS-M images, read the SCET values from the cube
    *
-   * 
+   *
    * @param filename The filename of the cube with the house keeping table.
    * @param linerate The linerate for the cube.
    *
@@ -292,7 +300,7 @@ namespace Isis {
    */
   void RosettaVirtisCamera::readSCET(const QString &filename) {
    //  Open the ISIS table object
-   std::vector<double> cacheTime; 
+   std::vector<double> cacheTime;
    Table hktable("VIRTISHouseKeeping", filename);
    m_lineRates.clear();
    int lineno(1);
@@ -339,7 +347,7 @@ namespace Isis {
    * MirrorSin, and MirrorCos.  These fields contain the scan line time in
    * SCLK, status of shutter - open, closed (dark), sine and cosine of the
    * scan mirror, respectively.
-   * 
+   *
    * @param filename The filename of the cube with the house keeping table.
    * @param linerate The linerate for the cube.
    *
@@ -443,9 +451,9 @@ namespace Isis {
    * From the VIR housekeeping data, compute the pointing table for each line
    *  in the image.  This table is for instrumentRotation(Table &) to establish
    *  line/sample pointing information.
-   *  
+   *
    * @internal
-   *   @history 2011-07-22 Kris Becker 
+   *   @history 2011-07-22 Kris Becker
    */
   Table RosettaVirtisCamera::getPointingTable(const QString &virChannel,
                                         const int zeroFrame)  {
@@ -566,7 +574,7 @@ namespace Isis {
    *  acceleration vectors are then set to 0.
    *
    * @internal
-   *   @history 2011-07-22 Kris Becker 
+   *   @history 2011-07-22 Kris Becker
    */
 
   RosettaVirtisCamera::SMatrix RosettaVirtisCamera::getStateRotation(const QString &frame1,
@@ -609,12 +617,12 @@ namespace Isis {
    *  the labels.  If a kernel with the file pattern
    *  "ROS_VIRTIS_M_????_????_V?.BC" is present as a CK kernel, then that kernel
    *  contains mirror scan angles for each line.
-   *  
+   *
    *  If the kernel does not exist, this camera model will provide these angles
    *  from the VIR housekeeping data.
    *
    * @internal
-   *   @history 2011-07-22 Kris Becker 
+   *   @history 2011-07-22 Kris Becker
    */
   bool RosettaVirtisCamera::hasArticulationKernel(Pvl &label) const {
     Kernels kerns(label);
@@ -629,7 +637,7 @@ namespace Isis {
 
 }
 
-/** 
+/**
  *  Instantiate a new RosettaVirtisCamera model for the given label content
  */
 extern "C" Isis::Camera *RosettaVirtisCameraPlugin(Isis::Cube &cube) {
diff --git a/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.h b/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.h
index e530b90565144e1b3d236797b90c61d47a43c1c4..19626605f3408ff094c4c8bc4815f8ea0584d6ee 100644
--- a/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.h
+++ b/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.h
@@ -1,6 +1,14 @@
 #ifndef RosettaVirtisCamera_h
 #define RosettaVirtisCamera_h
 
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "LineScanCamera.h"
 
 #include <QString>
@@ -10,11 +18,11 @@
 #include "VariableLineScanCameraDetectorMap.h"
 
 namespace Isis {
-  /** 
-   * @brief Camera model for both Rosetta VIRTIS-M instruments 
-   *  
-   * @ingroup SpiceInstrumentsAndCameras 
-   * @ingroup Rosetta 
+  /**
+   * @brief Camera model for both Rosetta VIRTIS-M instruments
+   *
+   * @ingroup SpiceInstrumentsAndCameras
+   * @ingroup Rosetta
    *
    * @author 2017-08-23 Kris Becker
    *
@@ -54,16 +62,16 @@ namespace Isis {
       double startTime() const;
       double endTime() const;
 
-      Table getPointingTable(const QString &channelId, 
+      Table getPointingTable(const QString &channelId,
                              const int zeroFrame);
-      SMatrix getStateRotation(const QString &frame1, 
-                               const QString &frame2, 
+      SMatrix getStateRotation(const QString &frame1,
+                               const QString &frame2,
                                const double &et) const;
 
       bool hasArticulationKernel(Pvl &label) const;
 
-      /** 
-       *  
+      /**
+       *
        * @author ????-??-?? Unknown
        * @internal
        *   @history ????-??-?? Unknown - Original version.
diff --git a/isis/src/rosetta/objs/RosettaVirtisCamera/unitTest.cpp b/isis/src/rosetta/objs/RosettaVirtisCamera/unitTest.cpp
index 3ef39928efe69d2473b6cc8815f12e49b8eafbee..8bca23dfc34222644016e4007dd5bf689db1e352 100644
--- a/isis/src/rosetta/objs/RosettaVirtisCamera/unitTest.cpp
+++ b/isis/src/rosetta/objs/RosettaVirtisCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 #include <algorithm>
@@ -34,7 +23,7 @@ using namespace std;
 using namespace Isis;
 
 void TestLineSamp(Camera *cam, double samp, double line);
-int TestCamera(Camera *cam, Cube c, double lines, double knownLat, double knownLon); 
+int TestCamera(Camera *cam, Cube c, double lines, double knownLat, double knownLon);
 
 /**
  *
@@ -46,8 +35,8 @@ int TestCamera(Camera *cam, Cube c, double lines, double knownLat, double knownL
  *   @history 2018-08-28 Kris Becker - Initial unit test for Rosetta VIRTIS
  *            instrument
  *   @history 2019-07-02 Krisitn Berry - Update to test only level 3 (calibrated) images, as only
- *            calibrated images are currently supported by the camera model. 
- */  
+ *            calibrated images are currently supported by the camera model.
+ */
 int main(void) {
   Preference::Preferences(true);
 
@@ -68,7 +57,7 @@ int main(void) {
     cout << endl << "Teting Level 3 (Calibrated) VIRTIS-M-IR Cube ..." << endl;
     knownLat = 29.1974649731145028;
     knownLon = 346.8749209987247468;
-    lines = 67; 
+    lines = 67;
     Cube irCube("$ISISTESTDATA/isis/src/rosetta/unitTestData/I1_00382172310.cub", "r");
     RosettaVirtisCamera *cam2 = (RosettaVirtisCamera *) CameraFactory::Create(irCube);
     TestCamera(cam2, irCube, lines, knownLat, knownLon);
@@ -83,60 +72,60 @@ int TestCamera(Camera *cam, Cube c, double lines, double knownLat, double knownL
   cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
   cout.setf(std::ios::fixed);
   cout << setprecision(9);
-  
+
   // Test kernel IDs
   cout << "Kernel IDs: " << endl;
   cout << "CK Frame ID = " << cam->CkFrameId() << endl;
   cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
   cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
   cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-  
+
   // Test name methods
   cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
   cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
   cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
   cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
-  
-  // Test Shutter Open/Close 
+
+  // Test Shutter Open/Close
   std::pair< double, double > imgTimes = cam->StartEndEphemerisTimes();
   cout << "Start Time: " << imgTimes.first << "\n";
   cout << "End Time:   " << imgTimes.second << "\n";
-  
+
   // Test all four corners to make sure the conversions are right
-  // For Rosetta, could not find images with the comet at all 4 corners, so these are 
+  // For Rosetta, could not find images with the comet at all 4 corners, so these are
   // actually corners of the comet, not the image. Values were chosen to approximate
-  // the corners on two different images (VIS and IR). 
-  
+  // the corners on two different images (VIS and IR).
+
   // good.
   cout << "For upper left corner ..." << endl;
   TestLineSamp(cam, 138.0, 10.0);
-  
+
   cout << "For upper right corner ..." << endl;
   TestLineSamp(cam, 165.0, 19.0);
-  
-  // fixme? 
+
+  // fixme?
   cout << "For lower left corner ..." << endl;
   TestLineSamp(cam, 138.0, 55.0);
-  
+
   cout << "For lower right corner ..." << endl;
   TestLineSamp(cam, 130.0, 55.0);
 
   double samp = 128.0;
   double line = lines/2.0;
   cout << "For center pixel position ..." << endl;
-  
+
   if(!cam->SetImage(samp, line)) {
     cout << "ERROR" << endl;
     return 0;
   }
-  
+
   if(abs(cam->UniversalLatitude() - knownLat) < 6E-12) {
     cout << "Latitude OK" << endl;
   }
   else {
     cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat << endl;
   }
-  
+
   if(abs(cam->UniversalLongitude() - knownLon) < 6E-12) {
     cout << "Longitude OK" << endl;
   }
@@ -166,4 +155,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/socet/apps/socetframesettings/main.cpp b/isis/src/socet/apps/socetframesettings/main.cpp
index bd11c2bb8762fb9907e862e39fd2fdfcb94a1604..86e3f90e865f2fe467d52cd6e50cfbf41498b211 100644
--- a/isis/src/socet/apps/socetframesettings/main.cpp
+++ b/isis/src/socet/apps/socetframesettings/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdlib>
diff --git a/isis/src/system/apps/blobdump/main.cpp b/isis/src/system/apps/blobdump/main.cpp
index 8b152ee091a10c47dd1b4d3b68bf9dfe88474d3e..3e8b88edc1e1063717400c83a0bbc0aa5b9e4032 100644
--- a/isis/src/system/apps/blobdump/main.cpp
+++ b/isis/src/system/apps/blobdump/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #define GUIHELPERS
 
 #include "Isis.h"
diff --git a/isis/src/system/apps/csspckgen/main.cpp b/isis/src/system/apps/csspckgen/main.cpp
index f829efeeedbbb5cc95b259b7e7f5d204d7d47058..695453d44e15c4432c9a504470cf93d1b6f57836 100644
--- a/isis/src/system/apps/csspckgen/main.cpp
+++ b/isis/src/system/apps/csspckgen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "FileName.h"
@@ -100,4 +108,3 @@ void IsisMain() {
   latestDb.addObject(latestMain);
   latestDb.write(outputName.expanded());
 }
-
diff --git a/isis/src/system/apps/dempack/main.cpp b/isis/src/system/apps/dempack/main.cpp
index e73186e77329bfc4d819fc0e11bcd1affb4bccec..e299d3a9692ba5ef87bc7d8908e664cd07f8e01d 100644
--- a/isis/src/system/apps/dempack/main.cpp
+++ b/isis/src/system/apps/dempack/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <iostream>
@@ -102,4 +110,3 @@ void IsisMain() {
   }
   os << "</packs>" << endl;
 }
-
diff --git a/isis/src/system/apps/isiscomplete/main.cpp b/isis/src/system/apps/isiscomplete/main.cpp
index 6433d6836fe502f0d9cec2845621068e9cdec584..a4477e048f905aea9ab9d8b91669ec8f618ebeae 100644
--- a/isis/src/system/apps/isiscomplete/main.cpp
+++ b/isis/src/system/apps/isiscomplete/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Application.h"
 #include "UserInterface.h"
 #include "FileList.h"
diff --git a/isis/src/system/apps/kerneldbgen/SpiceDbGen.cpp b/isis/src/system/apps/kerneldbgen/SpiceDbGen.cpp
index 3decd908c9d8de46b33911255798ddbfce4c0b64..71104fc2632ac1477e4610c76bb992fd421410b6 100644
--- a/isis/src/system/apps/kerneldbgen/SpiceDbGen.cpp
+++ b/isis/src/system/apps/kerneldbgen/SpiceDbGen.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.6 $
- * $Date: 2010/05/02 18:39:28 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <iostream>
 #include <algorithm>
diff --git a/isis/src/system/apps/kerneldbgen/SpiceDbGen.h b/isis/src/system/apps/kerneldbgen/SpiceDbGen.h
index 57d84256f8f3d4fdc207d9f12f8c58626e767c35..3a325303acdd548c1ecca240060eff9f477a1886 100644
--- a/isis/src/system/apps/kerneldbgen/SpiceDbGen.h
+++ b/isis/src/system/apps/kerneldbgen/SpiceDbGen.h
@@ -1,28 +1,14 @@
 #ifndef SpiceDbGen_h
 #define SpiceDbGen_h
 
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2010/05/02 18:39:28 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <iostream>
 
diff --git a/isis/src/system/apps/kerneldbgen/main.cpp b/isis/src/system/apps/kerneldbgen/main.cpp
index f084493bf61ce1011d2ef0eed57d7a21fa3c81e5..075e3bf66ed05afe0f95f5daf829814ecd29dfab 100644
--- a/isis/src/system/apps/kerneldbgen/main.cpp
+++ b/isis/src/system/apps/kerneldbgen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "SpiceDbGen.h"
 #include "FileList.h"
diff --git a/isis/src/system/apps/messckgen/main.cpp b/isis/src/system/apps/messckgen/main.cpp
index 76013eeb988804ca5f9f4b021331333686b81723..d18148a582872bcc421f84101eff2a8e67ea3237 100644
--- a/isis/src/system/apps/messckgen/main.cpp
+++ b/isis/src/system/apps/messckgen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <iostream>
@@ -323,4 +331,3 @@ PvlGroup* insertGroup(PvlObject &object, PvlGroup &group, int index) {
   // Return the location of the new group
   return &currentGroup;
 }
-
diff --git a/isis/src/system/apps/messspkgen/main.cpp b/isis/src/system/apps/messspkgen/main.cpp
index d9dc4ac5113bc9297d01bb683af21e4b3d3cac24..38ee9738389a6301f98e1b8b87a9b1bb2c7f9877 100644
--- a/isis/src/system/apps/messspkgen/main.cpp
+++ b/isis/src/system/apps/messspkgen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <iostream>
diff --git a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp
index 426f073720aabe44c1c6452863161d840a9a303b..e2a7836c2fae295958d778e85a72fed18d09bf65 100644
--- a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp
+++ b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2010/02/25 18:39:05 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+                                                                     
 #include <memory>
 #include <cmath>
 #include <cstdlib>
diff --git a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h
index e3d23039913d4e2ce5e4f9ae43905e33a94d0715..827577054fc535ce0194576d560eb4cbba556d8e 100644
--- a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h
+++ b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h
@@ -1,27 +1,14 @@
 #ifndef ProgramAnalyzer_h
 #define ProgramAnalyzer_h
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2008/09/06 06:47:48 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <string>
 #include <vector>
diff --git a/isis/src/system/apps/prtloganalyzer/main.cpp b/isis/src/system/apps/prtloganalyzer/main.cpp
index 2e51354ff0e2bc0155e80441ae569b6cfe1b323d..92615580f0c44f221998e5080db14a40d81b56db 100644
--- a/isis/src/system/apps/prtloganalyzer/main.cpp
+++ b/isis/src/system/apps/prtloganalyzer/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 // $Id$
 #include "Isis.h"
 #include "FileList.h"
diff --git a/isis/src/system/objs/Kernel/Kernel.cpp b/isis/src/system/objs/Kernel/Kernel.cpp
index f201e7485f553a78721c86f4b3603e53a4b1ba9c..3227fef3591d22d274f6c9872c1868dd5fb4ead0 100644
--- a/isis/src/system/objs/Kernel/Kernel.cpp
+++ b/isis/src/system/objs/Kernel/Kernel.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2009/07/28 21:01:18 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Kernel.h"
 
 #include <QString>
diff --git a/isis/src/system/objs/Kernel/Kernel.h b/isis/src/system/objs/Kernel/Kernel.h
index 5aca65e5cd7d53a0ac0652859ba2a324be9c6934..034ed90092181912627357f94f596dd08624dd31 100644
--- a/isis/src/system/objs/Kernel/Kernel.h
+++ b/isis/src/system/objs/Kernel/Kernel.h
@@ -1,27 +1,14 @@
 #ifndef Kernel_h
 #define Kernel_h
 
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2009/07/28 21:01:18 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <QString>
 #include <QStringList>
diff --git a/isis/src/system/objs/KernelDb/KernelDb.cpp b/isis/src/system/objs/KernelDb/KernelDb.cpp
index b3ee72f6e990c9fe9a49277b7b39bb4a725eff2c..38b305b120ee8b7d40b2bbfb96898749d9fa5eb0 100644
--- a/isis/src/system/objs/KernelDb/KernelDb.cpp
+++ b/isis/src/system/objs/KernelDb/KernelDb.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.5 $
- * $Date: 2009/05/12 20:11:20 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "KernelDb.h"
 
 #include <iomanip>
diff --git a/isis/src/system/objs/KernelDb/KernelDb.h b/isis/src/system/objs/KernelDb/KernelDb.h
index a2b1b0876ccc7749dfe16474441c917c24e9a763..d8147a3909fae60d66bec962556dd79e6d37e7d8 100644
--- a/isis/src/system/objs/KernelDb/KernelDb.h
+++ b/isis/src/system/objs/KernelDb/KernelDb.h
@@ -1,27 +1,14 @@
 #ifndef KernelDb_h
 #define KernelDb_h
 
-/**
- * @file
- * $Revision: 1.7 $
- * $Date: 2009/07/28 21:01:18 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <iostream>
 #include <queue>
diff --git a/isis/src/tgo/apps/tgocassis2isis/main.cpp b/isis/src/tgo/apps/tgocassis2isis/main.cpp
index 32381e105a221292b938d973d49a445b45dbd263..b26698792656439230b94b43d6364af2935ce494 100644
--- a/isis/src/tgo/apps/tgocassis2isis/main.cpp
+++ b/isis/src/tgo/apps/tgocassis2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QString>
diff --git a/isis/src/tgo/apps/tgocassismos/main.cpp b/isis/src/tgo/apps/tgocassismos/main.cpp
index d93ece6a20d0c3df8042360331d7e5a525d70d8d..72448c563a2679a2d731670ac352405760b5ac50 100644
--- a/isis/src/tgo/apps/tgocassismos/main.cpp
+++ b/isis/src/tgo/apps/tgocassismos/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Application.h"
@@ -187,8 +195,8 @@ void IsisMain() {
         observationId =  archiveGroup["ObservationId"][0];
         firstStartTime =      instGroup["StartTime"][0];
         startClock =     instGroup["SpacecraftClockStartCount"][0];
-        lastStartTime   =     instGroup["StartTime"][0]; 
-        exposureDuration  = instGroup["ExposureDuration"][0]; 
+        lastStartTime   =     instGroup["StartTime"][0];
+        exposureDuration  = instGroup["ExposureDuration"][0];
       }
       else {
         // current cube's StartTime/StopTime values
@@ -203,10 +211,10 @@ void IsisMain() {
         }
       }
     }
-       
+
    // After selecting the last StartTime, calculate the StopTime
    iTime lastStartTimeValue = iTime(lastStartTime);
-   iTime stopTimeValue = lastStartTimeValue + exposureDuration.toDouble(); 
+   iTime stopTimeValue = lastStartTimeValue + exposureDuration.toDouble();
    stopTime = stopTimeValue.UTC(3);
 
    // Get the archiveGroup from the first cube in the list
@@ -224,7 +232,7 @@ void IsisMain() {
     QString toMosaic = ui.GetFileName("TO");
     QString mosaicPriority = ui.GetString("PRIORITY");
 
-    QString parameters = "FROMLIST=" + list + " MOSAIC=" + toMosaic + " PRIORITY=" + mosaicPriority 
+    QString parameters = "FROMLIST=" + list + " MOSAIC=" + toMosaic + " PRIORITY=" + mosaicPriority
                           + " TRACK=TRUE";
 
     if (QString::compare(ui.GetString("GRANGE"), "USER", Qt::CaseInsensitive) == 0) {
@@ -248,7 +256,7 @@ void IsisMain() {
     mos += PvlKeyword("IncidenceAngle ", toString(incidenceAngle), "degrees");
     mos += PvlKeyword("EmissionAngle ", toString(emissionAngle), "degrees");
     mos += PvlKeyword("PhaseAngle ", toString(phaseAngle), "degrees");
-    mos += PvlKeyword("LocalTime ", toString(localSolarTime)); 
+    mos += PvlKeyword("LocalTime ", toString(localSolarTime));
     mos += PvlKeyword("SolarLongitude ", toString(solarLongitude), "degrees");
     mos += PvlKeyword("SubSolarAzimuth ", toString(sunAzimuth), "degrees");
     mos += PvlKeyword("NorthAzimuth ", toString(northAzimuth), "degrees");
diff --git a/isis/src/tgo/apps/tgocassisrdrgen/main.cpp b/isis/src/tgo/apps/tgocassisrdrgen/main.cpp
index 894c953c8082bc5f07975082f0b390deb2cf9b08..1cf5599fed734a93b5eecbc718b574a98a654a73 100644
--- a/isis/src/tgo/apps/tgocassisrdrgen/main.cpp
+++ b/isis/src/tgo/apps/tgocassisrdrgen/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QRegularExpression>
@@ -83,15 +91,15 @@ void IsisMain() {
     productId.setValue(observationId);
   }
 
-  targetGroup.addKeyword(productId);  
+  targetGroup.addKeyword(productId);
   logicalId += productId[0];
   process.setLogicalId(logicalId);
 
-  // For a mosaic, calculate stitched browse LID (lidvid) 
-  // This is as follows: 
+  // For a mosaic, calculate stitched browse LID (lidvid)
+  // This is as follows:
   // StartTime of the first framelet, rounded down to the nearest second
   if (label->findObject("IsisCube").hasGroup("Mosaic")) {
-    QString startTime = label->findObject("IsisCube").findGroup("Mosaic").findKeyword("StartTime"); 
+    QString startTime = label->findObject("IsisCube").findGroup("Mosaic").findKeyword("StartTime");
     startTime = iTime(startTime).UTC(0).toLower().remove("-").remove(":");
 
     // StopTime of the last framelet, rounded down to the nearest second + 4 seconds
@@ -137,10 +145,10 @@ void IsisMain() {
   process.addSchema("PDS4_PSA_EM16_CAS_1000.xsd",
                     "xmlns:cas",
                     "http://psa.esa.int/psa/em16/cas/v1");
- 
+
   // Add geometry schema for mosaics
   if (label->findObject("IsisCube").hasGroup("Mosaic")) {
-    process.addSchema("PDS4_GEOM_1B00_1610.sch", 
+    process.addSchema("PDS4_GEOM_1B00_1610.sch",
                       "PDS4_GEOM_1B00_1610.xsd",
                       "xmlns:geom",
                       "http://pds.nasa.gov/pds4/geom/v1");
@@ -152,7 +160,7 @@ void IsisMain() {
   QDomDocument &pdsLabel = process.GetLabel();
 
   // The default translation for for non-mosaicked output
-  QString exportTranslationFile = "$ISISROOT/appdata/translations/TgoCassisExport.trn"; 
+  QString exportTranslationFile = "$ISISROOT/appdata/translations/TgoCassisExport.trn";
 
   if (label->findObject("IsisCube").hasGroup("Mosaic")) {
     exportTranslationFile = "$ISISROOT/appdata/translations/TgoCassisExportMosaic.trn";
@@ -164,11 +172,11 @@ void IsisMain() {
   cubeLab.Auto(pdsLabel);
 
   ProcessExportPds4::translateUnits(pdsLabel);
-  process.reorder(); 
-  
+  process.reorder();
+
   // Units are automatically translated for the focal length, and there is no way at this time to
   // turn it off, but the cas:CASSIS_Data standard specifies that the focal-length output may not
-  // have units, so remove the units from cas:focal length. 
+  // have units, so remove the units from cas:focal length.
   QDomDocument &pdsLabelNext = process.GetLabel();
   QDomElement observationNode = pdsLabelNext.documentElement().firstChildElement("Observation_Area");
   QStringList xmlPath;
@@ -180,7 +188,7 @@ void IsisMain() {
   QDomElement focalLengthNode = process.getElement(xmlPath, observationNode);
 
   if (focalLengthNode.hasAttribute("unit")) {
-    focalLengthNode.removeAttribute("unit"); 
+    focalLengthNode.removeAttribute("unit");
   }
 
   QString outFile = ui.GetFileName("TO");
diff --git a/isis/src/tgo/apps/tgocassisstitch/main.cpp b/isis/src/tgo/apps/tgocassisstitch/main.cpp
index 72255c4ebea5795012811c66789ca17fbc43e818..87dab73609890cf22de7274d979dfb890aeed859 100644
--- a/isis/src/tgo/apps/tgocassisstitch/main.cpp
+++ b/isis/src/tgo/apps/tgocassisstitch/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QList>
diff --git a/isis/src/tgo/apps/tgocassisunstitch/main.cpp b/isis/src/tgo/apps/tgocassisunstitch/main.cpp
index 445e38ebf78523acbad94139de8e2b7236876868..0475e79764f24476d998849b385331dd0b03bdd4 100644
--- a/isis/src/tgo/apps/tgocassisunstitch/main.cpp
+++ b/isis/src/tgo/apps/tgocassisunstitch/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QList>
diff --git a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.cpp b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.cpp
index a5388e62cbdb899c662889723a82856025696213..3ef9d76f282bc300df8f9c87d2eefbe700b183c0 100644
--- a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.cpp
+++ b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision:$
- * $Date:$
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "TgoCassisCamera.h"
 
 #include <cmath>
@@ -54,7 +41,7 @@ namespace Isis {
 
     m_spacecraftNameLong = "Trace Gas Orbiter";
     m_spacecraftNameShort = "TGO";
-    
+
     NaifStatus::CheckErrors();
 
     // CaSSIS codes
@@ -91,7 +78,7 @@ namespace Isis {
       detMap->SetDetectorSampleSumming(summing);
       detMap->SetDetectorLineSumming(summing);
     }
-    
+
     // Setup focal plane map
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, cassisCode);
 
@@ -135,15 +122,15 @@ namespace Isis {
   /**
    * Returns the shutter open and close times.  The user should pass in the
    * ExposureDuration keyword value, converted from milliseconds to seconds, and
-   * the SpacecraftClockCount keyword value, converted to ephemeris time. The 
-   * StartTime keyword value from the labels represents the shutter open time of 
-   * the observation. This method uses the FramingCamera class implementation, 
-   * returning the given time value as the shutter open and the sum of the time 
-   * value and exposure duration as the shutter close. 
+   * the SpacecraftClockCount keyword value, converted to ephemeris time. The
+   * StartTime keyword value from the labels represents the shutter open time of
+   * the observation. This method uses the FramingCamera class implementation,
+   * returning the given time value as the shutter open and the sum of the time
+   * value and exposure duration as the shutter close.
    *
    * @param exposureDuration Exposure duration value from the labels, converted
    *                         to seconds.
-   * @param time The SpacecraftClockCount value from the labels, converted to 
+   * @param time The SpacecraftClockCount value from the labels, converted to
    *             ephemeris time
    * @return @b pair < @b iTime, @b iTime > The first value is the shutter
    *         open time and the second is the shutter close time.
@@ -160,8 +147,8 @@ namespace Isis {
 
   /**
    * CK frame ID -  TGO CaSSIS instrument code (TGO_CASSIS_FSA)
-   *  
-   * @return @b int The appropriate instrument code for the "Camera-matrix" 
+   *
+   * @return @b int The appropriate instrument code for the "Camera-matrix"
    *                Kernel Frame ID.
    */
   int TgoCassisCamera::CkFrameId() const {
@@ -169,9 +156,9 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
     * CK Reference ID - J2000
-    * 
+    *
     * @return @b int The appropriate instrument code for the "Camera-matrix"
     *                Kernel Reference ID.
     */
@@ -191,10 +178,10 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
     *  SPK Reference ID - J2000
-    *  
-    * @return @b int The appropriate instrument code for the Spacecraft 
+    *
+    * @return @b int The appropriate instrument code for the Spacecraft
     *                Kernel Reference ID.
     */
   int TgoCassisCamera::SpkReferenceId() const {
diff --git a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.h b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.h
index b77f1b82d7bc2558ddfaebd193754e9bc371e0ee..f8ca11f86b9da28c9e5d5e522976794b6fa63cf0 100644
--- a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.h
+++ b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.h
@@ -1,26 +1,14 @@
 #ifndef TgoCassisCamera_h
 #define TgoCassisCamera_h
-/**
- * @file
- * $Revision: $
- * $Date: $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "FramingCamera.h"
 
 #include <QString>
@@ -34,7 +22,7 @@ namespace Isis {
    * framing instrument because the framelet size is 256 lines or more. This is
    * also a more flexible camera model since it will make controlling the
    * individual framelets alot easier.
-   * 
+   *
    * The CaSSIS frame hierarchy is as follows:
    * <pre>
    *         J2000
@@ -59,7 +47,7 @@ namespace Isis {
    *           V
    *     TGO_CASSIS_FSA
    * </pre>
-   *  
+   *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Tgo
    * @author 2017-01-26 Kris Becker
@@ -72,7 +60,7 @@ namespace Isis {
    *                           because it is now being handled by the alpha
    *                           cube group. Fixes #5156.
    *   @history 2018-01-11 Christopher Combs - Added try/catch around creation of
-   *                           cameras distortion map to prevent segfault when 
+   *                           cameras distortion map to prevent segfault when
    *                           destructing. Fixes #5163.
    */
   class TgoCassisCamera : public FramingCamera {
@@ -80,7 +68,7 @@ namespace Isis {
       TgoCassisCamera(Cube &cube);
       ~TgoCassisCamera();
 
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
       virtual int CkFrameId() const;
       virtual int CkReferenceId() const;
diff --git a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.cpp b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.cpp
index 400ec34555017cdf691bdb60998812e7d26af82d..d2f133d1c7aa8e811069ce65b769a7319e838702 100644
--- a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.cpp
+++ b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.cpp
@@ -1,25 +1,11 @@
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/11/24 16:40:30 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <cmath>
 
 #include <QDebug>
@@ -28,7 +14,7 @@
 #include "TgoCassisDistortionMap.h"
 
 namespace Isis {
-  /** 
+  /**
    * Exomars TGO CaSSIS distortion map constructor.
    *
    * Create a camera distortion map.  This class maps between distorted
@@ -40,8 +26,8 @@ namespace Isis {
    * @param naifIkCode    NAIF IK code.
    *
    */
-  TgoCassisDistortionMap::TgoCassisDistortionMap(Camera *parent, 
-                                                 int naifIkCode) 
+  TgoCassisDistortionMap::TgoCassisDistortionMap(Camera *parent,
+                                                 int naifIkCode)
       : CameraDistortionMap(parent) {
 
     QString od = "INS" + toString(naifIkCode) + "_OD_";
@@ -60,43 +46,43 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    * Exomars TGO CaSSIS distortion map destructor.
    */
   TgoCassisDistortionMap::~TgoCassisDistortionMap() {
   }
 
 
-  /** 
-   * Compute undistorted focal plane (x,y) coordinate given the distorted 
-   * (x,y). 
-   *  
-   * Model derived by Stepan Tulyakov and Anoton Ivanov, EPFL (Ecole 
-   * Polytechnique Federale de Lausanne). 
-   *  
-   * Given distorted focal plane coordinates, in millimeters, and parameters of 
-   * rational CORRECTION model A1_corr, A2_corr, A3_corr, this function returns undistorted 
-   * focal plane coordinates, in millimeters. 
-   *  
-   * The rational optical distortion correction model is described by following 
-   * equations: 
-   *  
+  /**
+   * Compute undistorted focal plane (x,y) coordinate given the distorted
+   * (x,y).
+   *
+   * Model derived by Stepan Tulyakov and Anoton Ivanov, EPFL (Ecole
+   * Polytechnique Federale de Lausanne).
+   *
+   * Given distorted focal plane coordinates, in millimeters, and parameters of
+   * rational CORRECTION model A1_corr, A2_corr, A3_corr, this function returns undistorted
+   * focal plane coordinates, in millimeters.
+   *
+   * The rational optical distortion correction model is described by following
+   * equations:
+   *
    *  chi = [ dx^2, dx*dy, dy^2, dx, dy, 1]
-   *  
+   *
    *          A1_corr * chi'
    *  x =    ---------------
    *          A3_corr * chi'
-   *  
+   *
    *          A2_corr * chi'
    *  y =    ----------------
-   *          A3_corr * chi' 
+   *          A3_corr * chi'
    *
    * @param dx distorted focal plane x, in millimeters
    * @param dy distorted focal plane y, in millimeters
    *
    * @return @b bool Indicates whether the conversion was successful.
    */
-  bool TgoCassisDistortionMap::SetFocalPlane(const double dx, 
+  bool TgoCassisDistortionMap::SetFocalPlane(const double dx,
                                              const double dy) {
 
     p_focalPlaneX = dx;
@@ -107,13 +93,13 @@ namespace Isis {
     // This distortion model is only valid for values on the CCD:
     // -1/2 * pixel pitch * CCD width  = -10.24 < x < 10.24 = 1/2 * pixel pitch * CCD width
     // -1/2 * pixel pitch * CCD height = -10.24 < y < 10.24 = 1/2 * pixel pitch * CCD height
-    // 
+    //
     // Also, the zeros for the divider variable fall well outside the boundary
     // of the CCD. (See $ISISDATA/tgo/assets/distortion/DistortionModelA3CorrRoots.jpg).
-    // 
+    //
     // So, whenever x or y are too far from center or divider is near zero,
     // return the given inputs
-    
+
     if ( dx < -0.5*m_pixelPitch*m_width  - 0.2 ||
          dx >  0.5*m_pixelPitch*m_width  + 0.2 ||
          dy < -0.5*m_pixelPitch*m_height - 0.2 ||
@@ -135,28 +121,28 @@ namespace Isis {
   }
 
 
-  /** 
+  /**
    * Compute distorted focal plane (x,y) given an undistorted focal plane (x,y).
-   * 
-   * Model derived by Stepan Tulyakov and Anoton Ivanov, EPFL (Ecole 
-   * Polytechnique Federale de Lausanne). 
-   *  
+   *
+   * Model derived by Stepan Tulyakov and Anoton Ivanov, EPFL (Ecole
+   * Polytechnique Federale de Lausanne).
+   *
    * Given ideal focal plane coordinates, in millimeters, and parameters
-   * of rational CORRECTION model A1_dist, A2_dist, A3_dist, this function 
-   * returns distorted focal plane coordinates, in millimeters. 
-   *  
-   * The rational optical distortion correction model is described by following 
-   * equations: 
-   *  
+   * of rational CORRECTION model A1_dist, A2_dist, A3_dist, this function
+   * returns distorted focal plane coordinates, in millimeters.
+   *
+   * The rational optical distortion correction model is described by following
+   * equations:
+   *
    *  chi = [ dx^2, dx*dy, dy^2, dx, dy, 1]
-   *  
+   *
    *          A1_dist * chi'
    *  x =    ---------------
    *          A3_dist * chi'
-   *  
+   *
    *          A2_dist * chi'
    *  y =    ----------------
-   *          A3_dist * chi' 
+   *          A3_dist * chi'
    *
    *
    * @param ux undistorted focal plane x, in millimeters
@@ -174,10 +160,10 @@ namespace Isis {
     // This distortion model is only valid for values on the CCD:
     // -1/2 * pixel pitch * CCD width  = -10.24 < x < 10.24 = 1/2 * pixel pitch * CCD width
     // -1/2 * pixel pitch * CCD height = -10.24 < y < 10.24 = 1/2 * pixel pitch * CCD height
-    // 
+    //
     // Also, the zeros for the divider variable fall well outside the boundary
     // of the CCD. (See $ISISDATA/tgo/assets/distortion/DistortionModelA3DistRoots.jpg).
-    // 
+    //
     // So, whenever x or y are too far from center or divider is near zero,
     // return the given inputs
 
@@ -202,36 +188,35 @@ namespace Isis {
 
 
   /**
-   * Evaluate the value for the multi-variate polynomial, given the list of 
-   * 6 coefficients. 
-   *  
-   * We define 
+   * Evaluate the value for the multi-variate polynomial, given the list of
+   * 6 coefficients.
+   *
+   * We define
    *  @f[ chi = [x^2, xy, y^2, x, y, 1 @f]
    * and
    *  @f[ A = [A_0, A_1, A_2, A_3, A_4, A_5 @f]
-   *  
+   *
    * And we return
    *  @f[ \chi \cdot A = c_0 x^2 + c_1 xy + c_2 y^2 + c_3 x + c_4 y + c_5 @f]
-   * 
+   *
    * @param x The input x value.
    * @param y The input y value.
    * @param A The list of coeffients.
-   * 
+   *
    * @return @b double The value of chi dot A.
    */
   double TgoCassisDistortionMap::chiDotA(double x,
                                          double y,
-                                         QList<double> A) {  
+                                         QList<double> A) {
     double x2 = x*x;
     double y2 = y*y;
     double xy = x*y;
 
     return A[0] * x2
-         + A[1] * xy 
-         + A[2] * y2 
-         + A[3] * x 
-         + A[4] * y 
+         + A[1] * xy
+         + A[2] * y2
+         + A[3] * x
+         + A[4] * y
          + A[5];
   }
 }
-
diff --git a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.h b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.h
index a9cacd4f95dee81a7b91248c6dc7e4a429624137..b6608ef1e6f677b363c32eb75e6a4a247cb20e81 100644
--- a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.h
+++ b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.h
@@ -1,40 +1,27 @@
 #ifndef TgoCassisDistortionMap_h
 #define TgoCassisDistortionMap_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2008/11/24 16:40:31 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are
- *   public domain. See individual third-party library and package descriptions
- *   for intellectual property information, user agreements, and related
- *   information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or
- *   implied, is made by the USGS as to the accuracy and functioning of such
- *   software and related material nor shall the fact of distribution
- *   constitute any such warranty, and no responsibility is assumed by the
- *   USGS in connection therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
- *   in a browser or see the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <vector>
 #include "CameraDistortionMap.h"
 
 namespace Isis {
-  /** 
+  /**
    * Distort/undistort focal plane coordinates.
    *
    * Creates a map for adding/removing optical distortions from the focal plane of a camera.
    *
-   * Model derived by Stepan Tulyakov and Anoton Ivanov, 
-   * EPFL (Ecole Polytechnique Federale de Lausanne). 
-   *  
+   * Model derived by Stepan Tulyakov and Anoton Ivanov,
+   * EPFL (Ecole Polytechnique Federale de Lausanne).
+   *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Tgo
    *
@@ -53,7 +40,7 @@ namespace Isis {
    *                           passed into SetFocalPlane and SetUndistortedFocalPlane
    *                           are within valid range. References #5155
    *   @history 2018-06-15 Kristin Berry - Removed qFuzzyCompare comparison to fix "distortion
-   *                           model not being applied" error. 
+   *                           model not being applied" error.
    */
   class TgoCassisDistortionMap : public CameraDistortionMap {
     public:
@@ -68,15 +55,15 @@ namespace Isis {
     private:
       double chiDotA(double x, double y, QList<double> A);
 
-      QList<double> m_A1_corr; /**< Coefficients for rational distortion model used to compute 
+      QList<double> m_A1_corr; /**< Coefficients for rational distortion model used to compute
                                     ideal x from distorted x. */
-      QList<double> m_A2_corr; /**< Coefficients for rational distortion model used to compute 
+      QList<double> m_A2_corr; /**< Coefficients for rational distortion model used to compute
                                     ideal y from distorted y. */
       QList<double> m_A3_corr; /**< Coefficients for rational distortion model used to find scaling
                                     factor used when computing ideal coordinates from distorted. */
-      QList<double> m_A1_dist; /**< Coefficients for rational distortion model used to compute 
+      QList<double> m_A1_dist; /**< Coefficients for rational distortion model used to compute
                                     distorted x from ideal x. */
-      QList<double> m_A2_dist; /**< Coefficients for rational distortion model used to compute 
+      QList<double> m_A2_dist; /**< Coefficients for rational distortion model used to compute
                                     distorted y from ideal y. */
       QList<double> m_A3_dist; /**< Coefficients for rational distortion model used to find scaling
                                     factor used when computing distorted coordinates from ideal. */
diff --git a/isis/src/tgo/objs/TgoCassisCamera/unitTest.cpp b/isis/src/tgo/objs/TgoCassisCamera/unitTest.cpp
index 93951d7bbe7e92d4abd8d6c195304d1f9b65572b..6ffbdb925c0e81934d7fbbfb131b813d20173f39 100644
--- a/isis/src/tgo/objs/TgoCassisCamera/unitTest.cpp
+++ b/isis/src/tgo/objs/TgoCassisCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <QDebug>
 
 #include <iomanip>
@@ -38,10 +27,10 @@ using namespace Isis;
 void TestLineSamp(Camera *cam, double samp, double line);
 
 /**
- * Unit test for TGO CaSSIS camera. 
+ * Unit test for TGO CaSSIS camera.
  *
  * @internal
- *   @history 2018-08-15 Jeannie Backer - Updated lat/lon changes due to 
+ *   @history 2018-08-15 Jeannie Backer - Updated lat/lon changes due to
  *                           changes in focal length.
  */
 int main(void) {
@@ -69,7 +58,7 @@ int main(void) {
     qDebug() << "SPK Reference ID = " << cam->SpkReferenceId();
     qDebug() << "";
 
-    // Test Shutter Open/Close 
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
     double exposureDuration = toDouble( inst["ExposureDuration"][0] );
     QString stime = inst["StartTime"];
@@ -107,7 +96,7 @@ int main(void) {
       qDebug() << "Latitude OK";
     }
     else {
-      qDebug() << qSetRealNumberPrecision(18) 
+      qDebug() << qSetRealNumberPrecision(18)
                << "Latitude off by: " << cam->UniversalLatitude() - knownLat;
     }
 
@@ -115,7 +104,7 @@ int main(void) {
       qDebug() << "Longitude OK";
     }
     else {
-      qDebug() << qSetRealNumberPrecision(18) 
+      qDebug() << qSetRealNumberPrecision(18)
                << "Longitude off by: " << cam->UniversalLongitude() - knownLon;
     }
   }
@@ -146,4 +135,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     qDebug() << "";
   }
 }
-
diff --git a/isis/src/viking/apps/vik2isis/main.cpp b/isis/src/viking/apps/vik2isis/main.cpp
index c1eb241c3058d32b06f64c58763775e983bfe62b..eaa369ca115e2f4d46f51196ed71799330b9b146 100644
--- a/isis/src/viking/apps/vik2isis/main.cpp
+++ b/isis/src/viking/apps/vik2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
@@ -250,4 +258,3 @@ void TranslateVikingLabels(Pvl &pdsLabel, Cube *ocube) {
   res += PvlKeyword("Status", "Nominal");
   ocube->putGroup(res);
 }
-
diff --git a/isis/src/viking/apps/vikcal/CalParameters.cpp b/isis/src/viking/apps/vikcal/CalParameters.cpp
index 403ed73dd41271ecc1d6be058234c378e35b4d0c..55d0182f583ee6756462a31b13eae9e496b765b0 100644
--- a/isis/src/viking/apps/vikcal/CalParameters.cpp
+++ b/isis/src/viking/apps/vikcal/CalParameters.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.4 $
- * $Date: 2009/12/29 23:03:54 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <vector>
 
 #include <QString>
diff --git a/isis/src/viking/apps/vikcal/CalParameters.h b/isis/src/viking/apps/vikcal/CalParameters.h
index d14ba908e878949866339769f80fa43f359992a2..8b327a4912a65585eaa9921357742d35a9b798f6 100644
--- a/isis/src/viking/apps/vikcal/CalParameters.h
+++ b/isis/src/viking/apps/vikcal/CalParameters.h
@@ -1,26 +1,14 @@
 #ifndef CalParameters_h
 #define CalParameters_h
-/**
- * @file
- * $Revision: 1.2 $
- * $Date: 2007/01/30 22:12:24 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include <vector>
 
diff --git a/isis/src/viking/apps/vikcal/main.cpp b/isis/src/viking/apps/vikcal/main.cpp
index dbe1fd49e3c84f265d75be4f6cd100136ae78bc5..56d23d6e41e3b2af7374cc93a4c5f59cd69e4180 100644
--- a/isis/src/viking/apps/vikcal/main.cpp
+++ b/isis/src/viking/apps/vikcal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "SpecialPixel.h"
 #include "ProcessByLine.h"
@@ -127,6 +135,3 @@ void cal(vector<Buffer *> &in,
   }
 
 }
-
-
-
diff --git a/isis/src/viking/apps/vikclean/main.cpp b/isis/src/viking/apps/vikclean/main.cpp
index e584359e11719d0728ae3510444f2c6653397c11..a9b50e47dd34bc71b674a90c233eec089abd8db2 100644
--- a/isis/src/viking/apps/vikclean/main.cpp
+++ b/isis/src/viking/apps/vikclean/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "Pipeline.h"
 
@@ -46,4 +54,3 @@ void IsisMain() {
 
   p.Run();
 }
-
diff --git a/isis/src/viking/apps/vikfixtrx/main.cpp b/isis/src/viking/apps/vikfixtrx/main.cpp
index 45c17e30d07e7557508543065bb58213980d7008..c62f00924917da2f738fd6c521c5166ddb55ed3d 100644
--- a/isis/src/viking/apps/vikfixtrx/main.cpp
+++ b/isis/src/viking/apps/vikfixtrx/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include "ProcessByLine.h"
 #include "SpecialPixel.h"
@@ -98,4 +106,3 @@ void fixtrx(Buffer &in, Buffer &out) {
     }
   }
 }
-
diff --git a/isis/src/viking/apps/viknobutter/main.cpp b/isis/src/viking/apps/viknobutter/main.cpp
index dafabf44601f09fd94ef5d7d74ced654de9de878..fa83d4a3293139673c064f2f7b8fc1fc20bac962 100644
--- a/isis/src/viking/apps/viknobutter/main.cpp
+++ b/isis/src/viking/apps/viknobutter/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Pipeline.h"
@@ -107,4 +115,3 @@ void IsisMain() {
 
   pipeline.Run();
 }
-
diff --git a/isis/src/viking/apps/viknonoodle/main.cpp b/isis/src/viking/apps/viknonoodle/main.cpp
index 547868ef20d9349ae58bc02fba349b35601991be..3ea1ffcc91ed76f49034b6bedbbad61c4ef982d3 100644
--- a/isis/src/viking/apps/viknonoodle/main.cpp
+++ b/isis/src/viking/apps/viknonoodle/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 #include <complex>
 #include "FourierTransform.h"
diff --git a/isis/src/viking/apps/viknopepper/main.cpp b/isis/src/viking/apps/viknopepper/main.cpp
index bc94e851885b56242b312e7ac1bdeb8805f7abec..3818be929d2da606e5d98c525b5a641dacb3b50b 100644
--- a/isis/src/viking/apps/viknopepper/main.cpp
+++ b/isis/src/viking/apps/viknopepper/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Pipeline.h"
@@ -77,4 +85,3 @@ void IsisMain() {
 
   pipeline.Run();
 }
-
diff --git a/isis/src/viking/apps/viknosalt/main.cpp b/isis/src/viking/apps/viknosalt/main.cpp
index ce3634496f4f7b2339266d300097229d246af86a..a4e79c51b0c4162331133b226068644a8687da43 100644
--- a/isis/src/viking/apps/viknosalt/main.cpp
+++ b/isis/src/viking/apps/viknosalt/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Pipeline.h"
@@ -97,4 +105,3 @@ void IsisMain() {
 
   pipeline.Run();
 }
-
diff --git a/isis/src/viking/objs/VikingCamera/VikingCamera.cpp b/isis/src/viking/objs/VikingCamera/VikingCamera.cpp
index 6bd7d19f2d9699f500ea3082b5ae1206441cc6eb..60523741bcb047fc47d43474e6b318bf3ce13dd5 100644
--- a/isis/src/viking/objs/VikingCamera/VikingCamera.cpp
+++ b/isis/src/viking/objs/VikingCamera/VikingCamera.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.6 $
- * $Date: 2009/12/28 21:37:00 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "VikingCamera.h"
 
@@ -201,7 +188,7 @@ namespace Isis {
     NaifStatus::CheckErrors();
   }
 
-  
+
   /**
    * Returns the shutter open and close times. The user should pass in the
    * ExposureDuration keyword value and the SpacecraftClockCount keyword value,
diff --git a/isis/src/viking/objs/VikingCamera/VikingCamera.h b/isis/src/viking/objs/VikingCamera/VikingCamera.h
index cc42bd003531809766b954e3aa723f3eb405702c..cdfb0e34ba38a2963d838a93cf45630fb58b6d3f 100644
--- a/isis/src/viking/objs/VikingCamera/VikingCamera.h
+++ b/isis/src/viking/objs/VikingCamera/VikingCamera.h
@@ -1,26 +1,14 @@
 #ifndef VikingCamera_h
 #define VikingCamera_h
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2009/08/31 15:12:32 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FramingCamera.h"
 
@@ -33,10 +21,10 @@ namespace Isis {
    *
    * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Viking
-   *  
-   * @see http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=1975-075A 
-   * @see http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=1975-083A 
-   *  
+   *
+   * @see http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=1975-075A
+   * @see http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=1975-083A
+   *
    * @author 2005-06-09 Elizabeth Ribelin
    *
    * @internal
@@ -58,13 +46,13 @@ namespace Isis {
    *                           method. Updated unitTest to test for new methods.
    *                           Updated documentation. Added Isis Disclaimer to
    *                           files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-14 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test to test
    *                           these methods and added data for Viking1 VISA, Viking1 VISB, and
    *                           Viking2 VISA.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
    */
@@ -73,45 +61,45 @@ namespace Isis {
       VikingCamera(Cube &cube);
       //! Destroys the VikingCamera Object
       ~VikingCamera() {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
 
-      /** 
+      /**
        * CK frame ID -
        * Viking1 instrument code (VO1_PLATFORM) = -27000
        * Viking2 instrument code (VO2_PLATFORM) = -30000
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
-       *  
+       *
        */
       virtual int CkFrameId() const { return p_ckFrameId; }
 
-      /** 
+      /**
        * CK Reference ID -
        * B1950 or J2000 depending on the ck used.  The mdim2.0_rand ck is in
        * J2000.  Here we use B1950 (code = 2) because it was the reference
        * frame for the original spice
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
-       *  
+       *
        */
       virtual int CkReferenceId() const { return (2); }
 
-      /** 
+      /**
        * SPK Target Body ID -
        * VIKING 1 ORBITER = -27
        * VIKING 2 ORBITER = -30
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Target ID
        */
       virtual int SpkTargetId() const { return p_spkTargetId; }
 
-      /** 
+      /**
        * SPK Reference ID - B1950
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/viking/objs/VikingCamera/unitTest.cpp b/isis/src/viking/objs/VikingCamera/unitTest.cpp
index 6f595becf9d4a8ea1a1d6016293ffa13d7b502bf..6d47628a985ea51ea01436c19b058da4324b1afe 100644
--- a/isis/src/viking/objs/VikingCamera/unitTest.cpp
+++ b/isis/src/viking/objs/VikingCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -64,47 +53,47 @@ int main(void) {
       cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
       cout.setf(std::ios::fixed);
       cout << setprecision(9);
-      
+
       // Test kernel IDs
       cout << "Kernel IDs: " << endl;
       cout << "CK Frame ID = " << cam->CkFrameId() << endl;
       cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
       cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
       cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-            
-      
-      // Test Shutter Open/Close 
+
+
+      // Test Shutter Open/Close
       const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
-      double exposureDuration = ((double) inst["ExposureDuration"])/1000; 
+      double exposureDuration = ((double) inst["ExposureDuration"])/1000;
       QString stime = inst["StartTime"];
       double et; // StartTime keyword is the center exposure time
       str2et_c(stime.toLatin1().data(), &et);
       pair <iTime, iTime> shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration);
       cout << "Shutter open = " << shuttertimes.first.Et() << endl;
       cout << "Shutter close = " << shuttertimes.second.Et() << endl << endl;
-      
+
       // Test all four corners to make sure the conversions are right
       cout << "For upper left corner ..." << endl;
       TestLineSamp(cam, 1.0, 1.0);
-      
+
       cout << "For upper right corner ..." << endl;
       TestLineSamp(cam, cam->Samples(), 1.0);
-      
+
       cout << "For lower left corner ..." << endl;
       TestLineSamp(cam, 1.0, cam->Lines());
-      
+
       cout << "For lower right corner ..." << endl;
       TestLineSamp(cam, cam->Samples(), cam->Lines());
-      
+
       double samp = cam->Samples() / 2;
       double line = cam->Lines() / 2;
       cout << "For center pixel position ..." << endl;
-      
+
       if(!cam->SetImage(samp, line)) {
         cout << "ERROR" << endl;
         return 0;
       }
-      
+
       // changed tolerance to allow hiclops to pass
       if(abs(cam->UniversalLatitude() - knownLat[i]) < 1.18E-05) {
         cout << "Latitude OK" << endl;
@@ -112,7 +101,7 @@ int main(void) {
       else {
         cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat[i] << endl;
       }
-      
+
       // changed tolerance to allow hiclops to pass
       if(abs(cam->UniversalLongitude() - knownLon[i]) < 4.47E-6) {
         cout << "Longitude OK" << endl;
@@ -122,7 +111,7 @@ int main(void) {
       }
       cout << endl << "--------------------------------------------" << endl;
     }
-    
+
     // Test the name methods
     cout << endl << "Testing name methods:" << endl << endl;
     files.append("$ISISTESTDATA/isis/src/viking/unitTestData/f006a03.cropped.cub"); // Viking1 VISA
@@ -136,7 +125,7 @@ int main(void) {
       cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
       cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;
     }
-    
+
     // Test exception: camera is not a supported Kaguya camera
     cout << endl << "Testing exceptions:" << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
@@ -167,4 +156,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-
diff --git a/isis/src/voyager/apps/voy2isis/main.cpp b/isis/src/voyager/apps/voy2isis/main.cpp
index 254dfb2df71cc19a6a4438c1d4d3fa7e886fa5fc..eba505707de5b63b4ad96b8b80165ce5dcb70daf 100644
--- a/isis/src/voyager/apps/voy2isis/main.cpp
+++ b/isis/src/voyager/apps/voy2isis/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <cstdio>
@@ -475,16 +483,16 @@ QByteArray fixLabels(QString fileName, History *hist){
 
   // Check if the instrument name is valid
   if (labels.contains(QByteArray("INSTRUMENT_NAME\n"))) {
- 
-    // Only set name to Unknown and warn the user about a missing INSTRUMENT_NAME 
+
+    // Only set name to Unknown and warn the user about a missing INSTRUMENT_NAME
     // if it wasn't specified by the user.
     UserInterface &ui = Application::GetUserInterface();
     if (ui.GetString("INSTRUMENT") == "AUTOMATIC") {
       labels.replace("INSTRUMENT_NAME", "INSTRUMENT_NAME                  = Unknown");
-      PvlGroup insNameWarning("Warning"); 
+      PvlGroup insNameWarning("Warning");
       PvlKeyword insNameMsg("Message", "The INSTRUMENT_NAME for [" + fileName + "] is empty."
                                 + "The InstrumentId in the output cube will instead be set to "
-                                + "[Unknown] and the labels will not translate. To create a cube "  
+                                + "[Unknown] and the labels will not translate. To create a cube "
                                 + "with translated labels, re-run this "
                                 + "application with INSTRUMENT set to NAC or WAC.");
 
diff --git a/isis/src/voyager/apps/voycal/main.cpp b/isis/src/voyager/apps/voycal/main.cpp
index 2c92ace9acf4d54e1a96b9bd9f34d846d70251c0..f48402b9c748f72da1ac0856063929d57e841a71 100644
--- a/isis/src/voyager/apps/voycal/main.cpp
+++ b/isis/src/voyager/apps/voycal/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include <QList>
diff --git a/isis/src/voyager/apps/voyramp/main.cpp b/isis/src/voyager/apps/voyramp/main.cpp
index 97caac8020a314b134cde1627824aaa8aab7d303..df32c24d46599a364ad992f58cb2f18dc0d126aa 100644
--- a/isis/src/voyager/apps/voyramp/main.cpp
+++ b/isis/src/voyager/apps/voyramp/main.cpp
@@ -1,3 +1,11 @@
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include "Isis.h"
 
 #include "Buffer.h"
diff --git a/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.cpp b/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.cpp
index 21a90ec85f110b5e2d89ac630de6e613a5203e5c..8cf15adfc4ecc850500d814bc21a945b1ebe204a 100644
--- a/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.cpp
+++ b/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.cpp
@@ -1,24 +1,11 @@
-/**
- * @file
- * $Revision: 1.0 $
- * $Date: 2009/05/27 12:08:01 $
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software
- *   and related material nor shall the fact of distribution constitute any such
- *   warranty, and no responsibility is assumed by the USGS in connection
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "VoyagerCamera.h"
 
@@ -176,7 +163,7 @@ namespace Isis {
     NaifStatus::CheckErrors();
   }
 
-  
+
   /**
    * Returns the shutter open and close times. The user should pass in the
    * ExposureDuration keyword value and the StartTime keyword value, converted
@@ -214,7 +201,7 @@ namespace Isis {
  * This is the function that is called in order to instantiate a VoyagerCamera
  * object.
  *
- * @param cube The image Cube 
+ * @param cube The image Cube
  *
  * @return Isis::Camera* VoyagerCamera
  * @author 2010-07-19 Mackenzie Boyd
diff --git a/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.h b/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.h
index 739381e0380041802666f074d5c2c13ce127b972..c124612366d485f6779145a45ec24ac109c4fdef 100644
--- a/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.h
+++ b/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.h
@@ -1,49 +1,37 @@
 #ifndef VoyagerCamera_h
 #define VoyagerCamera_h
-/**                                                                       
- * @file                                                                  
- * $Revision: 1.0 $ 
- * $Date: 2009/05/27 12:08:01 $ 
- *                                                                        
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *                                                                        
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.                                                           
- *                                                                        
- *   For additional information, launch                                   
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,              
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.                                    
- */
+
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 
 #include "FramingCamera.h"
 
 namespace Isis {
-  /**                                                                       
-   * @brief Voyager Camera Model                
-   *                                        
-   * This is the camera model for Voyager 1 and 2 wide and narrow 
-   * angle cameras. 
-   * 
-   * @ingroup SpiceInstrumentsAndCameras                                   
+  /**
+   * @brief Voyager Camera Model
+   *
+   * This is the camera model for Voyager 1 and 2 wide and narrow
+   * angle cameras.
+   *
+   * @ingroup SpiceInstrumentsAndCameras
    * @ingroup Voyager
-   *  
-   *  
-   * @see 
+   *
+   *
+   * @see
    *      http://pds-imaging.jpl.nasa.gov/data/vg2-n-iss-2-edr-v1.0/vg_0009/document/volinfo.txt
-   * @see http://voyager.jpl.nasa.gov 
-   * @see http://pds-imaging.jpl.nasa.gov/portal/voyager_mission.html 
-   * @see http://astrogeology.usgs.gov/Missions/Voyager 
-   *                                                                         
+   * @see http://voyager.jpl.nasa.gov
+   * @see http://pds-imaging.jpl.nasa.gov/portal/voyager_mission.html
+   * @see http://astrogeology.usgs.gov/Missions/Voyager
+   *
    * @author 2010-07-19 Mackenzie Boyd
-   * 
-   * @internal 
+   *
+   * @internal
    *   @history 2010-07-19 Mackenzie Boyd - Original Version
    *   @history 2011-01-14 Travis Addair - Added new CK/SPK accessor methods,
    *                           pure virtual in Camera, implemented in mission
@@ -53,54 +41,54 @@ namespace Isis {
    *                           method. Updated unitTest to test for new methods.
    *                           Updated documentation. Added Isis Disclaimer to
    *                           files. Added NAIF error check to constructor.
-   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis 
+   *   @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
    *                           coding standards. References #972.
    *   @history 2015-08-14 Ian Humphrey and Makayla Shepherd - Added new data members and methods
    *                           to get spacecraft and instrument names. Extended unit test for
    *                           name methods and added new data for Voyager1 WAC, Voyager2 NAC and
    *                           and WAC.
-   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument 
+   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
    *                           members and methods and removed implementation of these methods
    *                           since Camera now handles this. References #2335.
-   */                                                                       
+   */
   class VoyagerCamera : public FramingCamera {
     public:
       VoyagerCamera (Cube &cube);
       //! Destroys the VoyagerCamera object.
       ~VoyagerCamera () {};
-      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time, 
+      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                              double exposureDuration);
-      /** 
+      /**
        * CK frame ID -
        * Voyager 1 instrument code (VG1_SCAN_PLATFORM) = -31100
        * Voyager 2 instrument code (VG1_SCAN_PLATFORM) [sic] = -32100
-       *  
-       * @return @b int The appropriate instrument code for the "Camera-matrix" 
+       *
+       * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Frame ID
        */
       virtual int CkFrameId() const { return p_ckFrameId; }
 
-      /** 
+      /**
        * CK Reference ID - B1950
-       * 
+       *
        * @return @b int The appropriate instrument code for the "Camera-matrix"
        *         Kernel Reference ID
        */
       virtual int CkReferenceId() const { return (2); }
 
-      /** 
+      /**
        * SPK Target Body ID -
        * VOYAGER 1 = -31
        * VOYAGER 2 = -32
-       *  
-       * @return @b int The appropriate instrument code for the Spacecraft 
+       *
+       * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Target ID
        */
       virtual int SpkTargetId() const { return p_spkTargetId; }
 
-      /** 
+      /**
        * SPK Reference ID - J2000
-       * 
+       *
        * @return @b int The appropriate instrument code for the Spacecraft
        *         Kernel Reference ID
        */
diff --git a/isis/src/voyager/objs/VoyagerCamera/unitTest.cpp b/isis/src/voyager/objs/VoyagerCamera/unitTest.cpp
index d99f4f46507154838267059f9d6049d3d256efe0..0c35afbc2bedfee7df1b023888a0f48590980141 100644
--- a/isis/src/voyager/objs/VoyagerCamera/unitTest.cpp
+++ b/isis/src/voyager/objs/VoyagerCamera/unitTest.cpp
@@ -1,22 +1,11 @@
-/**
- * @file
- *
- *   Unless noted otherwise, the portions of Isis written by the USGS are public
- *   domain. See individual third-party library and package descriptions for 
- *   intellectual property information,user agreements, and related information.
- *
- *   Although Isis has been used by the USGS, no warranty, expressed or implied,
- *   is made by the USGS as to the accuracy and functioning of such software 
- *   and related material nor shall the fact of distribution constitute any such 
- *   warranty, and no responsibility is assumed by the USGS in connection 
- *   therewith.
- *
- *   For additional information, launch
- *   $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see 
- *   the Privacy &amp; Disclaimers page on the Isis website,
- *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- *   http://www.usgs.gov/privacy.html.
- */
+/** This is free and unencumbered software released into the public domain.
+
+The authors of ISIS do not claim copyright on the contents of this file.
+For more details about the LICENSE terms and the AUTHORS, you will
+find files of those names at the top level of this repository. **/
+
+/* SPDX-License-Identifier: CC0-1.0 */
+
 #include <iomanip>
 #include <iostream>
 
@@ -53,61 +42,61 @@ int main(void) {
     // and "Longitude off by: " values directly into these variables.
     double knownLat = -1.03098148697020941;
     double knownLon = 82.0423364316989279;
-    
+
     Cube c("$ISISTESTDATA/isis/src/voyager/unitTestData/c1639118.imq.cub", "r");
     VoyagerCamera *cam = (VoyagerCamera *) CameraFactory::Create(c);
     cout << "FileName: " << FileName(c.fileName()).name() << endl;
     cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
     cout.setf(std::ios::fixed);
     cout << setprecision(9);
-    
+
     // Test kernel IDs
     cout << "Kernel IDs: " << endl;
     cout << "CK Frame ID = " << cam->CkFrameId() << endl;
     cout << "CK Reference ID = " << cam->CkReferenceId() << endl;
     cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
     cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;
-    
-    // Test Shutter Open/Close 
+
+    // Test Shutter Open/Close
     const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
-    double exposureDuration = ((double) inst["ExposureDuration"])/1000; 
+    double exposureDuration = ((double) inst["ExposureDuration"])/1000;
     QString stime = inst["StartTime"];
     double et; // StartTime keyword is the center exposure time
     str2et_c(stime.toLatin1().data(), &et);
     pair <iTime, iTime> shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration);
     cout << "Shutter open = " << shuttertimes.first.Et() << endl;
     cout << "Shutter close = " << shuttertimes.second.Et() << endl << endl;
-    
+
     // Test all four corners to make sure the conversions are right
     cout << "For upper left corner ..." << endl;
     TestLineSamp(cam, 1.0, 1.0);
-    
+
     cout << "For upper right corner ..." << endl;
     TestLineSamp(cam, cam->Samples() - 5.0, 16.0);
-    
+
     cout << "For lower left corner ..." << endl;
     TestLineSamp(cam, 12.0, cam->Lines() - 12.0);
-    
+
     cout << "For lower right corner ..." << endl;
     TestLineSamp(cam, cam->Samples() - 4.0, cam->Lines());
-    
+
     double samp = cam->Samples() / 2;
     double line = cam->Lines() / 2;
     cout << "For center pixel position ..." << endl;
-    
+
     if(!cam->SetImage(samp, line)) {
       cout << "ERROR" << endl;
       return 0;
     }
-    
+
     if(abs(cam->UniversalLatitude() - knownLat) < 1E-10) {
       cout << "Latitude OK" << endl;
     }
     else {
-      cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat 
+      cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat
            << endl;
     }
-    
+
     if(abs(cam->UniversalLongitude() - knownLon) < 1E-10) {
       cout << "Longitude OK" << endl;
     }
@@ -115,7 +104,7 @@ int main(void) {
       cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon
            << endl;
     }
-    
+
     // Test name methods
     cout << endl << "Testing name methods" << endl << endl;
     QList<QString> files;
@@ -123,7 +112,7 @@ int main(void) {
     files.append("$ISISTESTDATA/isis/src/voyager/unitTestData/c1639241.cropped.cub"); // Voyager1 WAC
     files.append("$ISISTESTDATA/isis/src/voyager/unitTestData/c2065022.cropped.cub"); // Voyager2 NAC
     files.append("$ISISTESTDATA/isis/src/voyager/unitTestData/c4397840.cropped.cub"); // Voyager2 WAC
-  
+
     for (int i = 0; i < files.size(); i++) {
       Cube cu(files[i], "r");
       VoyagerCamera *vCam = (VoyagerCamera *) CameraFactory::Create(cu);
@@ -132,13 +121,13 @@ int main(void) {
       cout << "Instrument Name Long: " << vCam->instrumentNameLong() << endl;
       cout << "Instrument Name Short: " << vCam->instrumentNameShort() << endl << endl;
     }
-    
+
     // Test exception: camera is not a supported Kaguya camera
     cout << endl << "Testing exceptions:" << endl << endl;
     Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
     VoyagerCamera testCam(test);
   }
-  
+
   catch(IException &e) {
     e.print();
   }
@@ -164,4 +153,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
     cout << "DeltaLine = ERROR" << endl << endl;
   }
 }
-