diff --git a/inst/com/test/caldb/data/cgro/comptel/caldb.indx b/inst/com/test/caldb/data/cgro/comptel/caldb.indx
index 784dc9d..205d81e 100644
--- a/inst/com/test/caldb/data/cgro/comptel/caldb.indx
+++ b/inst/com/test/caldb/data/cgro/comptel/caldb.indx
@@ -1 +1 @@
-SIMPLE = T / file does conform to FITS standard BITPIX = 8 / number of bits per data pixel NAXIS = 0 / number of data axes EXTEND = T / FITS dataset may contain extensions COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H END XTENSION= 'BINTABLE' / binary table extension BITPIX = 8 / 8-bit bytes NAXIS = 2 / 2-dimensional binary table NAXIS1 = 945 / width of table in bytes NAXIS2 = 14 / number of rows in table PCOUNT = 0 / size of special data area GCOUNT = 1 / one data group (required keyword) TFIELDS = 18 / number of fields in each row TTYPE1 = 'TELESCOP' / label for field 1 TFORM1 = '10A ' / data format of field: ASCII Character TTYPE2 = 'INSTRUME' / label for field 2 TFORM2 = '10A ' / data format of field: ASCII Character TTYPE3 = 'DETNAM ' / label for field 3 TFORM3 = '20A ' / data format of field: ASCII Character TTYPE4 = 'FILTER ' / label for field 4 TFORM4 = '10A ' / data format of field: ASCII Character TTYPE5 = 'CAL_DEV ' / label for field 5 TFORM5 = '20A ' / data format of field: ASCII Character TTYPE6 = 'CAL_DIR ' / label for field 6 TFORM6 = '70A ' / data format of field: ASCII Character TTYPE7 = 'CAL_FILE' / label for field 7 TFORM7 = '40A ' / data format of field: ASCII Character TTYPE8 = 'CAL_CLAS' / label for field 8 TFORM8 = '3A ' / data format of field: ASCII Character TTYPE9 = 'CAL_DTYP' / label for field 9 TFORM9 = '4A ' / data format of field: ASCII Character TTYPE10 = 'CAL_CNAM' / label for field 10 TFORM10 = '20A ' / data format of field: ASCII Character TTYPE11 = 'CAL_CBD ' / label for field 11 TFORM11 = '630A70 ' / data format of field: ASCII Character TTYPE12 = 'CAL_XNO ' / label for field 12 TFORM12 = '1I ' / data format of field: 2-byte INTEGER TTYPE13 = 'CAL_VSD ' / label for field 13 TFORM13 = '10A ' / data format of field: ASCII Character TTYPE14 = 'CAL_VST ' / label for field 14 TFORM14 = '8A ' / data format of field: ASCII Character TTYPE15 = 'REF_TIME' / label for field 15 TFORM15 = '1D ' / data format of field: 8-byte DOUBLE TTYPE16 = 'CAL_QUAL' / label for field 16 TFORM16 = '1I ' / data format of field: 2-byte INTEGER TTYPE17 = 'CAL_DATE' / label for field 17 TFORM17 = '8A ' / data format of field: ASCII Character TTYPE18 = 'CAL_DESC' / label for field 18 TFORM18 = '70A ' / data format of field: ASCII Character EXTNAME = 'CIF ' / name of this extension CIFVERSN= '1992a ' / Version of CIF format HISTORY File modified by user 'jurgen' with fv on 2017-09-06T16:39:43 END CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf module_status.fits BCFDATAMODULE_STATUS DEFAULT 2017-09-0600:00:00@é+ 17/09/06D1 and D2 module status database CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf m10371_sda.fits BCFDATASDA DEFAULT 2017-08-2900:00:00@é+ 17/08/29D1 module response parametrisation CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf m10564_sdb.fits BCFDATASDB DEFAULT 2017-08-2900:00:00@é+ 17/08/29D2 module response parametrisation CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf r00004_ict.fits BCFDATAICT DEFAULT 2017-08-2900:00:00@é+ 17/08/29Instrument Characteristics Table CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u47512_iaq.fits BCFDATAIAQ UNH(0.75-1.0)MeV NONE NONE NONE NONE NONE NONE NONE NONE 1997-09-1000:00:00@é+ 97/09/10Monte Carlo simulated powerlaw IAQ for 0.75-1 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u47569_iaq.fits BCFDATAIAQ UNH(1.0-3.0)MeV NONE NONE NONE NONE NONE NONE NONE NONE 1997-09-1000:00:00@é+ 97/09/10Monte Carlo simulated powerlaw IAQ for 1-3 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u47741_iaq.fits BCFDATAIAQ UNH(3.0-10.0)MeV NONE NONE NONE NONE NONE NONE NONE NONE 1997-09-1000:00:00@é+ 97/09/10Monte Carlo simulated powerlaw IAQ for 3-10 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u48091_iaq.fits BCFDATAIAQ UNH(10.0-30.0)MeV NONE NONE NONE NONE NONE NONE NONE NONE 1997-09-1000:00:00@é+ 97/09/10Monte Carlo simulated powerlaw IAQ for 10-30 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u09517_iaq.fits BCFDATAIAQ UNH(1.809)MeV 2017-09-0100:00:00@é+ 17/09/01Monte Carlo simulated IAQ for 1.809 MeV line CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf m16845_iaq.fits BCFDATAIAQ MPE(1.156)MeV 2017-09-0100:00:00@é+ 17/09/01Model IAQ for 1.156 MeV line (probably for 1.066-1.246 MeV band) CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf plaw2_0.75-1MeV_iaq.fits BCFDATAIAQ PLAW2(0.75-1.0)MeV 2017-09-0100:00:00@é+ 17/09/01GammaLib powerlaw IAQ for 0.75-1 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf plaw2_1-3MeV_iaq.fits BCFDATAIAQ PLAW2(1.0-3.0)MeV 2017-09-0100:00:00@é+ 17/09/01GammaLib powerlaw IAQ for 1-3 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf plaw2_3-10MeV_iaq.fits BCFDATAIAQ PLAW2(3.0-10.0)MeV 2017-09-0100:00:00@é+ 17/09/01GammaLib powerlaw IAQ for 3-10 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf plaw2_10-30MeV_iaq.fits BCFDATAIAQ PLAW2(10.0-30.0)MeV 2017-09-0100:00:00@é+ 17/09/01GammaLib powerlaw IAQ for 10-30 MeV with index=-2
\ No newline at end of file
+SIMPLE = T / file does conform to FITS standard BITPIX = 8 / number of bits per data pixel NAXIS = 0 / number of data axes EXTEND = T / FITS dataset may contain extensions COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H END XTENSION= 'BINTABLE' / binary table extension BITPIX = 8 / 8-bit bytes NAXIS = 2 / 2-dimensional binary table NAXIS1 = 945 / width of table in bytes NAXIS2 = 14 / number of rows in table PCOUNT = 0 / size of special data area GCOUNT = 1 / one data group (required keyword) TFIELDS = 18 / number of fields in each row TTYPE1 = 'TELESCOP' / label for field 1 TFORM1 = '10A ' / data format of field: ASCII Character TTYPE2 = 'INSTRUME' / label for field 2 TFORM2 = '10A ' / data format of field: ASCII Character TTYPE3 = 'DETNAM ' / label for field 3 TFORM3 = '20A ' / data format of field: ASCII Character TTYPE4 = 'FILTER ' / label for field 4 TFORM4 = '10A ' / data format of field: ASCII Character TTYPE5 = 'CAL_DEV ' / label for field 5 TFORM5 = '20A ' / data format of field: ASCII Character TTYPE6 = 'CAL_DIR ' / label for field 6 TFORM6 = '70A ' / data format of field: ASCII Character TTYPE7 = 'CAL_FILE' / label for field 7 TFORM7 = '40A ' / data format of field: ASCII Character TTYPE8 = 'CAL_CLAS' / label for field 8 TFORM8 = '3A ' / data format of field: ASCII Character TTYPE9 = 'CAL_DTYP' / label for field 9 TFORM9 = '4A ' / data format of field: ASCII Character TTYPE10 = 'CAL_CNAM' / label for field 10 TFORM10 = '20A ' / data format of field: ASCII Character TTYPE11 = 'CAL_CBD ' / label for field 11 TFORM11 = '630A70 ' / data format of field: ASCII Character TTYPE12 = 'CAL_XNO ' / label for field 12 TFORM12 = '1I ' / data format of field: 2-byte INTEGER TTYPE13 = 'CAL_VSD ' / label for field 13 TFORM13 = '10A ' / data format of field: ASCII Character TTYPE14 = 'CAL_VST ' / label for field 14 TFORM14 = '8A ' / data format of field: ASCII Character TTYPE15 = 'REF_TIME' / label for field 15 TFORM15 = '1D ' / data format of field: 8-byte DOUBLE TTYPE16 = 'CAL_QUAL' / label for field 16 TFORM16 = '1I ' / data format of field: 2-byte INTEGER TTYPE17 = 'CAL_DATE' / label for field 17 TFORM17 = '8A ' / data format of field: ASCII Character TTYPE18 = 'CAL_DESC' / label for field 18 TFORM18 = '70A ' / data format of field: ASCII Character EXTNAME = 'CIF ' / name of this extension CIFVERSN= '1992a ' / Version of CIF format HISTORY File modified by user 'jurgen' with fv on 2017-09-06T16:39:43 END CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf module_status.fits BCFDATAMODULE_STATUS DEFAULT 2017-09-0600:00:00@é+ 17/09/06D1 and D2 module status database CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf m10371_sda.fits BCFDATASDA DEFAULT 2017-08-2900:00:00@é+ 17/08/29D1 module response parametrisation CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf m10564_sdb.fits BCFDATASDB DEFAULT 2017-08-2900:00:00@é+ 17/08/29D2 module response parametrisation CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf r00004_ict.fits BCFDATAICT DEFAULT 2017-08-2900:00:00@é+ 17/08/29Instrument Characteristics Table CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u47512_iaq.fits BCFDATAIAQ SIM2(0.75-1.00)MeV(2)deg NONE NONE NONE NONE NONE NONE NONE NONE 1997-09-1000:00:00@é+ 97/09/10Monte Carlo simulated powerlaw IAQ for 0.75-1 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u47569_iaq.fits BCFDATAIAQ SIM2(1.00-3.00)MeV(2)deg NONE NONE NONE NONE NONE NONE NONE NONE 1997-09-1000:00:00@é+ 97/09/10Monte Carlo simulated powerlaw IAQ for 1-3 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u47741_iaq.fits BCFDATAIAQ SIM2(3.00-10.00)MeV(2)deg NONE NONE NONE NONE NONE NONE NONE NONE 1997-09-1000:00:00@é+ 97/09/10Monte Carlo simulated powerlaw IAQ for 3-10 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u48091_iaq.fits BCFDATAIAQ SIM2(10.00-30.00)MeV(2)deg NONE NONE NONE NONE NONE NONE NONE NONE 1997-09-1000:00:00@é+ 97/09/10Monte Carlo simulated powerlaw IAQ for 10-30 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf u09517_iaq.fits BCFDATAIAQ SIM2(1.809)MeV(2)deg 2017-09-0100:00:00@é+ 17/09/01Monte Carlo simulated IAQ for 1.809 MeV line CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf m16845_iaq.fits BCFDATAIAQ MPE(1.156)MeV 2017-09-0100:00:00@é+ 17/09/01Model IAQ for 1.156 MeV line (probably for 1.066-1.246 MeV band) CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf plaw2_0.75-1MeV_iaq.fits BCFDATAIAQ PLAW2(0.75-1.0)MeV 2017-09-0100:00:00@é+ 17/09/01GammaLib powerlaw IAQ for 0.75-1 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf plaw2_1-3MeV_iaq.fits BCFDATAIAQ PLAW2(1.0-3.0)MeV 2017-09-0100:00:00@é+ 17/09/01GammaLib powerlaw IAQ for 1-3 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf plaw2_3-10MeV_iaq.fits BCFDATAIAQ PLAW2(3.0-10.0)MeV 2017-09-0100:00:00@é+ 17/09/01GammaLib powerlaw IAQ for 3-10 MeV with index=-2 CGRO COMPTEL NONE NONE ONLINE data/cgro/comptel/bcf plaw2_10-30MeV_iaq.fits BCFDATAIAQ PLAW2(10.0-30.0)MeV 2017-09-0100:00:00@é+ 17/09/01GammaLib powerlaw IAQ for 10-30 MeV with index=-2
\ No newline at end of file
diff --git a/inst/com/test/data/obs.xml b/inst/com/test/data/obs.xml
index 3eeddb0..49de846 100644
--- a/inst/com/test/data/obs.xml
+++ b/inst/com/test/data/obs.xml
@@ -5,6 +5,6 @@
-
+
diff --git a/inst/com/test/test_COM.cpp b/inst/com/test/test_COM.cpp
index 07bace9..0c3c130 100644
--- a/inst/com/test/test_COM.cpp
+++ b/inst/com/test/test_COM.cpp
@@ -41,7 +41,7 @@
/* __ Constants __________________________________________________________ */
const std::string datadir = std::getenv("TEST_COM_DATA");
const std::string com_caldb = datadir + "/../../caldb";
-const std::string com_iaq = "UNH(1.0-3.0)MeV"; // 1-3 MeV
+const std::string com_iaq = "SIM2(1.00-3.00)MeV(2)deg"; // 1-3 MeV
const std::string com_dre = datadir+"/m50439_dre.fits"; // 1-3 MeV
const std::string com_drb = datadir+"/m34997_drg.fits";
const std::string com_drg = datadir+"/m34997_drg.fits";
diff --git a/inst/com/test/test_COM.py b/inst/com/test/test_COM.py
index ef093fe..5d758b0 100755
--- a/inst/com/test/test_COM.py
+++ b/inst/com/test/test_COM.py
@@ -156,7 +156,7 @@ class Test(gammalib.GPythonTestSuite):
test_support.pickeling(self, gammalib.GCOMBvc(bvc))
test_support.pickeling(self, gammalib.GCOMBvcs(bvcs))
test_support.pickeling(self, gammalib.GCOMObservation(obs[0]))
- test_support.pickeling(self, gammalib.GCOMResponse(caldb, 'UNH(1.0-3.0)MeV'))
+ test_support.pickeling(self, gammalib.GCOMResponse(caldb, 'SIM2(1.00-3.00)MeV(2)deg'))
test_support.pickeling(self, gammalib.GCOMRoi(instdir, 10.0, 1.0, 5.0))
#test_support.pickeling(self, gammalib.GCOMSelection())
#test_support.pickeling(self, gammalib.GCOMStatus())