Merge pull request #518 from JanNiklasB/master

ObserverTimeEvolution minimum errormessage bug

Author: JulienDoerner

CMakeLists.txt

@@ -70,7 +70,7 @@ if(ENABLE_GIT)
   get_git_head_revision(GIT_REFSPEC GIT_SHA1)
   git_describe(GIT_DESC --tags)
 endif(ENABLE_GIT)
-IF(NOT ENABLE_GIT OR (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND"))
+IF(NOT ENABLE_GIT OR ("${GIT_SHA1}" STREQUAL "GITDIR-NOTFOUND"))
   set(GIT_REFSPEC "")
   set(GIT_SHA1 "")
   set(GIT_DESC "${CRPROPA_RELEASE_VERSION}-no-git")

src/module/Observer.cpp

@@ -246,17 +246,17 @@ std::string ObserverParticleIdVeto::getDescription() const {
 ObserverTimeEvolution::ObserverTimeEvolution() {}
 
 ObserverTimeEvolution::ObserverTimeEvolution(double min, double dist, double numb) {
+	setIsLogarithmicScaling(false);
 	setMaximum(min + (numb - 1) * dist);
 	setMinimum(min);
 	setNIntervals(numb);
-	setIsLogarithmicScaling(false);
 }
 
 ObserverTimeEvolution::ObserverTimeEvolution(double min, double max, double numb, bool log) {
+	setIsLogarithmicScaling(log);
 	setMinimum(min);
 	setMaximum(max);
 	setNIntervals(numb);
-	setIsLogarithmicScaling(log);
 }
 
 ObserverTimeEvolution::ObserverTimeEvolution(const std::vector<double> &detList){
@@ -335,7 +335,7 @@ void ObserverTimeEvolution::addTimeRange(double min, double max, double numb, bo
 		if (log) {
 			if ( min <= 0 ){
 				std::cout << "min can not be <= 0 if log=true" << std::endl;
-				throw new std::invalid_argument("min can not be <= 0 if log=true");
+				throw new std::runtime_error("min can not be <= 0 if log=true");
 			}
 			addTime(min * pow(max / min, i / (numb - 1.0)));
 		} else {
@@ -355,9 +355,9 @@ void ObserverTimeEvolution::setTimes(const std::vector<double> &detList){
 }
 
 void ObserverTimeEvolution::setMinimum(double min){
-	if ( min <= 0 ){
+	if ( (min <= 0) && isLogarithmicScaling){
 		std::cout << "minimum can not be <= 0 if isLogarithmicScaling=true" << std::endl;
-		throw new std::invalid_argument("minimum can not be <= 0 if isLogarithmicScaling=true");
+		throw new std::runtime_error("minimum can not be <= 0 if isLogarithmicScaling=true");
 	}
 	this->minimum = min;
 }