Permalink
Browse files

More code cleanup

  • Loading branch information...
1 parent eb145cc commit f51552f460dafd7b55379e32eb928d681e30f2ce @oleg-alexandrov oleg-alexandrov committed Jun 24, 2012
View
2 README
@@ -77,7 +77,7 @@ Available in the docs directory.
Please mail all bug reports or general questions to:
- oleg.alexandrov@nasa.gov
+ oleg.alexandrov@nasa.gov or ara.nefian@nasa.gov
B. Credits
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,10 +1,20 @@
-// __BEGIN_LICENSE__
-// Copyright (C) 2006-2011 United States Government as represented by
-// the Administrator of the National Aeronautics and Space Administration.
-// All Rights Reserved.
+//__BEGIN_LICENSE__
+// Copyright (c) 2009-2012, United States Government as represented by the
+// Administrator of the National Aeronautics and Space Administration. All
+// rights reserved.
+//
+// The NGT platform is licensed under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance with the
+// License. You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
// __END_LICENSE__
-
/// \file Albedo.h
#ifndef __PHOTOMETRY_ALBEDO_H__
@@ -16,37 +26,24 @@
namespace photometry {
- //image mosaic functions
- void InitImageMosaic(ModelParams input_img_params,
- std::vector<ModelParams> overlap_img_params,
- GlobalParams globalParams);
-
- void InitImageMosaicByBlocks(ModelParams input_img_params,
- std::vector<ModelParams> overlap_img_params,
- GlobalParams globalParams);
-
- void UpdateImageMosaic(ModelParams input_img_params,
- std::vector<ModelParams> overlap_img_params,
- GlobalParams globalParams);
-
struct phaseCoeffsData{
- double phaseCoeffA1_num, phaseCoeffA1_den;
- double phaseCoeffA2_num, phaseCoeffA2_den;
+ double phaseCoeffC1_num, phaseCoeffC1_den;
+ double phaseCoeffC2_num, phaseCoeffC2_den;
phaseCoeffsData(){
- phaseCoeffA1_num = phaseCoeffA1_den = phaseCoeffA2_num = phaseCoeffA2_den = 0.0;
+ phaseCoeffC1_num = phaseCoeffC1_den = phaseCoeffC2_num = phaseCoeffC2_den = 0.0;
}
void writeToFile(std::string fileName){
std::cout << "Writing to: " << fileName << std::endl;
std::ofstream fh(fileName.c_str());
fh.precision(16);
- fh << phaseCoeffA1_num << ' ' << phaseCoeffA1_den << ' '
- << phaseCoeffA2_num << ' ' << phaseCoeffA2_den << std::endl;
+ fh << phaseCoeffC1_num << ' ' << phaseCoeffC1_den << ' '
+ << phaseCoeffC2_num << ' ' << phaseCoeffC2_den << std::endl;
fh.close();
}
void readFromFile(std::string fileName){
std::ifstream fh(fileName.c_str());
- if (!fh || !( fh >> phaseCoeffA1_num >> phaseCoeffA1_den >>
- phaseCoeffA2_num >> phaseCoeffA2_den) ){
+ if (!fh || !( fh >> phaseCoeffC1_num >> phaseCoeffC1_den >>
+ phaseCoeffC2_num >> phaseCoeffC2_den) ){
std::cerr << "Could not read phase data from file: " << fileName << std::endl;
exit(1);
}
@@ -55,6 +52,8 @@ namespace photometry {
};
double actOnTile(bool isLastIter, bool computeErrors,
+ std::string sampleTileFile,
+ ImageRecord albedoTileCorners,
std::string DEMTileFile,
std::string albedoTileFile,
std::string errorTileFile, std::string weightsSumFile,
@@ -65,6 +64,21 @@ namespace photometry {
void AppendCostFunToFile(double costFunVal, std::string fileName);
+ // Only obsolete code below
+
+ //image mosaic functions
+ void InitImageMosaic(ModelParams input_img_params,
+ std::vector<ModelParams> overlap_img_params,
+ GlobalParams globalParams);
+
+ void InitImageMosaicByBlocks(ModelParams input_img_params,
+ std::vector<ModelParams> overlap_img_params,
+ GlobalParams globalParams);
+
+ void UpdateImageMosaic(ModelParams input_img_params,
+ std::vector<ModelParams> overlap_img_params,
+ GlobalParams globalParams);
+
//albedo mosaic functions
void InitAlbedoMosaic(ModelParams input_img_params,
std::vector<ModelParams> overlap_img_params,
View
@@ -1,7 +1,18 @@
-// __BEGIN_LICENSE__
-// Copyright (C) 2006-2011 United States Government as represented by
-// the Administrator of the National Aeronautics and Space Administration.
-// All Rights Reserved.
+//__BEGIN_LICENSE__
+// Copyright (c) 2009-2012, United States Government as represented by the
+// Administrator of the National Aeronautics and Space Administration. All
+// rights reserved.
+//
+// The NGT platform is licensed under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance with the
+// License. You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
// __END_LICENSE__
View
@@ -1,7 +1,18 @@
-// __BEGIN_LICENSE__
-// Copyright (C) 2006-2011 United States Government as represented by
-// the Administrator of the National Aeronautics and Space Administration.
-// All Rights Reserved.
+//__BEGIN_LICENSE__
+// Copyright (c) 2009-2012, United States Government as represented by the
+// Administrator of the National Aeronautics and Space Administration. All
+// rights reserved.
+//
+// The NGT platform is licensed under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance with the
+// License. You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
// __END_LICENSE__
View
@@ -1,7 +1,18 @@
-// __BEGIN_LICENSE__
-// Copyright (C) 2006-2011 United States Government as represented by
-// the Administrator of the National Aeronautics and Space Administration.
-// All Rights Reserved.
+//__BEGIN_LICENSE__
+// Copyright (c) 2009-2012, United States Government as represented by the
+// Administrator of the National Aeronautics and Space Administration. All
+// rights reserved.
+//
+// The NGT platform is licensed under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance with the
+// License. You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
// __END_LICENSE__
View
@@ -1,7 +1,18 @@
-// __BEGIN_LICENSE__
-// Copyright (C) 2006-2011 United States Government as represented by
-// the Administrator of the National Aeronautics and Space Administration.
-// All Rights Reserved.
+//__BEGIN_LICENSE__
+// Copyright (c) 2009-2012, United States Government as represented by the
+// Administrator of the National Aeronautics and Space Administration. All
+// rights reserved.
+//
+// The NGT platform is licensed under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance with the
+// License. You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
// __END_LICENSE__
View
@@ -1,7 +1,18 @@
-// __BEGIN_LICENSE__
-// Copyright (C) 2006-2011 United States Government as represented by
-// the Administrator of the National Aeronautics and Space Administration.
-// All Rights Reserved.
+//__BEGIN_LICENSE__
+// Copyright (c) 2009-2012, United States Government as represented by the
+// Administrator of the National Aeronautics and Space Administration. All
+// rights reserved.
+//
+// The NGT platform is licensed under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance with the
+// License. You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
// __END_LICENSE__
View
@@ -1,7 +1,18 @@
-// __BEGIN_LICENSE__
-// Copyright (C) 2006-2011 United States Government as represented by
-// the Administrator of the National Aeronautics and Space Administration.
-// All Rights Reserved.
+//__BEGIN_LICENSE__
+// Copyright (c) 2009-2012, United States Government as represented by the
+// Administrator of the National Aeronautics and Space Administration. All
+// rights reserved.
+//
+// The NGT platform is licensed under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance with the
+// License. You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
// __END_LICENSE__
Oops, something went wrong.

0 comments on commit f51552f

Please sign in to comment.