From 2ef54a55a10c1c2a56fe36fd7ca9ec685e4ae1a3 Mon Sep 17 00:00:00 2001
From: Jürgen Knödlseder <jurgen.knodlseder@irap.omp.eu>
Date: Fri, 31 Jan 2014 01:23:04 +0100
Subject: [PATCH] GCaldb::filename selection method is now case insensitive.

---
 inst/cta/src/GCTAResponse.cpp |  2 +-
 src/obs/GCaldb.cpp            | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/inst/cta/src/GCTAResponse.cpp b/inst/cta/src/GCTAResponse.cpp
index 112215d..83e05d4 100644
--- a/inst/cta/src/GCTAResponse.cpp
+++ b/inst/cta/src/GCTAResponse.cpp
@@ -527,7 +527,7 @@ void GCTAResponse::load(const std::string& rspname)
     m_caldb = caldb;
 
     // First attempt reading the response using the GCaldb interface
-    std::string expr      = "NAME("+gammalib::toupper(rspname)+")";
+    std::string expr      = "NAME("+rspname+")";
     std::string aeffname  = m_caldb.filename("","","EFF_AREA","","",expr);
     std::string psfname   = m_caldb.filename("","","RPSF","","",expr);
     std::string edispname = m_caldb.filename("","","EDISP","","",expr);
diff --git a/src/obs/GCaldb.cpp b/src/obs/GCaldb.cpp
index 6f40195..3109d5e 100644
--- a/src/obs/GCaldb.cpp
+++ b/src/obs/GCaldb.cpp
@@ -387,7 +387,8 @@ std::string GCaldb::filename(const std::string& detector,
             // Check for detector
             if (detector.length() > 0) {
                 const GFitsTableCol* column = (*m_cif)["DETNAM"];
-                if (detector == column->string(i)) {
+                if (gammalib::toupper(detector) ==
+                    gammalib::toupper(column->string(i))) {
                     match_detector = true;
                 }
             }
@@ -398,7 +399,8 @@ std::string GCaldb::filename(const std::string& detector,
             // Check for filter
             if (filter.length() > 0) {
                 const GFitsTableCol* column = (*m_cif)["FILTER"];
-                if (filter == column->string(i)) {
+                if (gammalib::toupper(filter) ==
+                    gammalib::toupper(column->string(i))) {
                     match_filter = true;
                 }
             }
@@ -409,7 +411,8 @@ std::string GCaldb::filename(const std::string& detector,
             // Check for code name
             if (codename.length() > 0) {
                 const GFitsTableCol* column = (*m_cif)["CAL_CNAM"];
-                if (codename == column->string(i)) {
+                if (gammalib::toupper(codename) ==
+                    gammalib::toupper(column->string(i))) {
                     match_codename = true;
                 }
             }
@@ -420,7 +423,8 @@ std::string GCaldb::filename(const std::string& detector,
             // Check for date
             if (date.length() > 0) {
                 const GFitsTableCol* column = (*m_cif)["CAL_VSD"];
-                if (date == column->string(i)) {
+                if (gammalib::toupper(date) ==
+                    gammalib::toupper(column->string(i))) {
                     match_date = true;
                 }
             }
@@ -431,7 +435,8 @@ std::string GCaldb::filename(const std::string& detector,
             // Check for time
             if (time.length() > 0) {
                 const GFitsTableCol* column = (*m_cif)["CAL_VST"];
-                if (time == column->string(i)) {
+                if (gammalib::toupper(time) ==
+                    gammalib::toupper(column->string(i))) {
                     match_time = true;
                 }
             }
@@ -444,7 +449,8 @@ std::string GCaldb::filename(const std::string& detector,
                 const GFitsTableCol* column = (*m_cif)["CAL_CBD"];
                 int num_columns = column->elements(i);
                 for (int k = 0; k < num_columns; ++k) {
-                    if (expr == column->string(i,k)) {
+                    if (gammalib::toupper(expr) ==
+                        gammalib::toupper(column->string(i,k))) {
                         match_expr = true;
                         break;
                     }
--
libgit2 0.21.4