ޥ>F=<=d"<<6< ;j; 1::-n9 98*8/d8:W77*66T5T40.33C }DGG
+FF#fErE4D4DG C
PC[zBiBq
+AA=A ҳ@@?b?)->B>9=.=J<"<\;S@;m:G:{: 99 =8a77kZ616>uM546q44ffC }DGhUGbFfFm@*EƀExlD3D
DWC'qC MB
+BA A1@@ kj?F?&r>>-oa=՞=4Y<:]A:?9r9;8#807D7OP655@k43.RC }DH-5
G?G,C~FʸF+QEتE*_DD)iCMC(o#BB'jACA&V"@@%$?{j?#>P>"/= = ת@>o==
۪<<";~;:-:h~9sd9Q#^8h85iX77165 e54g43 38Ͽ C }DH HHG1G4%4FF!EѶ>
=>,>k>5Y> >=l=)F=xX=<_=xF<՟ <6p> >>K>ۼ===~=== w<?Q?>!Y>܀>qJ=>0k> )===F
+==^m>!>V$F>P=4=^?=[ =<ڝ<>ēG>>> F>?=A=}=/R<Ύ<8>y>(@=J'=R =PT= [<{<|Ā<(;p; ;@::R:E$9w99 8]33C{0KD1DUrD
Q2C Cw6C$ lB6BB>hVA=AA\0AB@@$@)?o?y?De?n>f>b»>!=r==+"~>cM>NK>؝=k=[H= U>> ><
:=e=W=8ի<<<3.(;6*;8;(:ͬs:x]:9 r9J0o8$8xl874 C{0KEXE=,YD8DD.$Cm|CɟC J5BqBpBA@A]A:@Ds@K?}%?t?;
+Q>;> q>+@#=D=F=<ہ?>ܸ>Q==\ =RR<0<8;!^;vq;2::K9D9q98{8.]u773ls6ՀffC{0KFw>tD>q=ӌ=?!<@@t,@
+?/ ?2!>=>d%>T==G=%Ou<_~3>U0=|=Қ=^>G=ց =fn5 k5=33C{0KGGXFF#EE4+D=DG%/CuC[B~BqA
+AVA @~@%?z?)k>?>:uW=V=LU<<_;,;r:6B:c:9 /9 8
+E8
|7a7k6|5D5Ie4W|ffC{0KGiGbFFmCE ExsD;D5DoC0C YBBޯA:A]@#@ A?E?&w>D>.;=)=5~<<NC{0KH-6:GG,EsF>F+UEE*dDD)rCC(~+BB'AA&@@%i?Ԭ?$5>|>"==!5<B< ;W;:::d9ܖ9 38\987}U6w6Xq55'k4ۂ3/C{0KHHGF$FqEEdfDQDWRCѥCK BB@_AA5@j @+Z.?gw?!S>ι>"$=o=7M7)T6p6 i5o 4k4#.3y! C{0KH\HHϣG4#G4'F)F!EEfDQD
CvVBJ B\A1\AF$@@1?? >Y>(=WYNJ>>mQ>6c> =Xe=5=~fc=B]= AcA+CA-@@u@\8@&#n?,?W?Ƶ?Ui? o>;> >>MBu>=.8=25==Am=#l>z>rvZ>1>==#=J' =2> >W.>==l=]= i<ߥ<(H<^l< r";V9;@;O; {:j:u: cc9xy C
DCCC2t+B̊BoBqB(A_A{Ad[nA ,@@@WA@:8?]??K>?
>%)>;\>>>=+=%"=1<< 7>y9>)| == =R=F< -nA&6A7A]JAPc@@8@)@?H?_?D?$>#>c>jP=Ʊ=#=,<̉<B>S>OF>}=x=]&=?<]p >K>NT><==<=:W<q{>s^>+=H== <>=> #==^_=dB<~^<;!i;;kC;0::V59d9?9%K8 8Pu77rp6ǿffC
F<EEEDqBDI3CC C 7UBSBWtA(A aA*@@fQ@ -??5]P>G>uE>==@U[T@*@t)@
+?d?2o>@>e0>|==&Y< ~9N9j9 8F8!7*7%a6&6#!/C
F=F`F
RE>bE,'DyDS">Ck?CCBBB.RoAAU@rO@ @˕??/>">V)=n=t=<<.;';R::| : 94E9 8M867}7E6ǖN6Dn5ԉ C
G4FFRuEE6Es0EV DDv"CCjC0BIBMjAL
+Ane;A f@M@3?i?,>>>H =O =g(<<<l;;$::;$9ƭ9RG8ܽG8fU7h7s `6ap6p55Ud33C
GDG+FF#SE E4D DG*\C }C[8B拊BrA"Ag!A @@ND??)>I;>:==M>.==6`<-<=c;S;E :C9:K!9͂ 9O688O77J+6m6;5L5 h4UBC
H-6GG,FFF+W!E߄E*gDGD)xtC OC(BDB'AA&@@%?
?$~>?>#G=,=!ێ<< &; ; <:=:r9G98f8n77x6x5{5Sp4U 4 C
HH=G ;FsFqELEdk.DDWCѮ9CKƙBFB@qAA5Q@-@+?k?!>(>
+=(=">=i<499'9 88g7 [6>6_eZ5Ȋ5134j4[3R9D EBBBR B"JAQAؤA͝AgZA2A
+D@ղ@#@7+@E5@a?z???Y&?'Z?>>c>nB>7è>
L=5I=s=
+ =F=L<灀<"pP>% >>N> =跧===D9=p<<2> >s4w>2;>=*==Lh^=2]G>
T>WX>'===_= yŁl>|>?d>T==8=3@~1>z>* ==`=S$=9<$<)h<0 ;,;ݣ;U;_c:s3:w: 99r9!033D ED2DUtD
RC"CwC$B=B1B>rA-"A%A]tAY@Ą@E@)"??x?D?S>tV>d&s>@=z=j=.O<¬A(@@@4? ?8?A>>%>O;>==^4=<@>>>>=49=v=9=;L!<<@ <8d;;;3b;::w:* 9Z9}O
9t8*/8SI7% D EEYE=.DDD.'kCrCC QB|QBp
BtAڼA]A=@oG@Kn???;>r>>,L==a= ߀<N>{A> =2P=_A=?<>u>9="l=Ab@@t@
+??2>ʊ>e> =q1='<3A>V==]=r4W>H|}=ъ=hB<79˃9X88r7w77+6Aw6 m533D EGGF dF#HE E4DtDG-C#C[@B擻BrA1AqfA @v@h??*
+>>;W:=ĉ^=N < ;T: :
E99w@88"/77(h 6@6'5
5 wDffD EGkaGbFFmG=EExyQDDHDD C:C fPBrB AXAΰ@W@ &??'` >/>/=6=6<<>;پ;F:):N9\9TAk8֙8X3W7Ї7X$ 6d6Ql5~5@w42ſD EH-7oGRG,GvFF+XmE1E*jDD)| CC(BB'A$A&@.@%>?0?$>#>#2=="Zwat>q=l=$>Թ=*<
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/test_GModel.cpp b/test/test_GModel.cpp
index 9922281..3122dd5 100644
--- a/test/test_GModel.cpp
+++ b/test/test_GModel.cpp
@@ -51,6 +51,7 @@ void TestGModel::set(void)
m_map_file = datadir + "/cena_lobes_parkes.fits";
m_cube_file = datadir + "/test_cube.fits";
m_filefct = datadir + "/filefunction.txt";
+ m_table = datadir + "/model_point_table.fits";
m_temp_lightcurve = datadir + "/model_temporal_lightcurve.fits";
m_temp_phasecurve = datadir + "/model_temporal_phasecurve.fits";
m_xml_file = datadir + "/crab.xml";
@@ -67,10 +68,11 @@ void TestGModel::set(void)
m_xml_model_point_smoothbplaw = datadir + "/model_point_smoothbplaw.xml";
m_xml_model_point_supeplaw = datadir + "/model_point_supeplaw.xml";
m_xml_model_point_logparabola = datadir + "/model_point_logparabola.xml";
- m_xml_point_multiplicative = datadir + "/model_point_multiplicative.xml";
- m_xml_point_exponential = datadir + "/model_point_exponential.xml";
m_xml_model_point_nodes = datadir + "/model_point_nodes.xml";
m_xml_model_point_filefct = datadir + "/model_point_filefct.xml";
+ m_xml_model_point_table = datadir + "/model_point_table.xml";
+ m_xml_point_multiplicative = datadir + "/model_point_multiplicative.xml";
+ m_xml_point_exponential = datadir + "/model_point_exponential.xml";
m_xml_model_spectral_composite = datadir + "/model_spectral_composite.xml";
m_xml_model_diffuse_const = datadir + "/model_diffuse_const.xml";
m_xml_model_diffuse_cube = datadir + "/model_diffuse_cube.xml";
@@ -170,6 +172,8 @@ void TestGModel::set(void)
"Test GModelSpectralNodes");
append(static_cast(&TestGModel::test_filefct),
"Test GModelSpectralFunc");
+ append(static_cast(&TestGModel::test_table),
+ "Test GModelSpectralTable");
append(static_cast(&TestGModel::test_spectral_composite),
"Test GModelSpectralComposite");
append(static_cast(&TestGModel::test_spectral_model),
@@ -2291,6 +2295,61 @@ void TestGModel::test_filefct(void)
return;
}
+
+/***********************************************************************//**
+ * @brief Test GModelSpectralTable class
+ ***************************************************************************/
+void TestGModel::test_table(void)
+{
+ // Test void constructor
+ GModelSpectralTable model1;
+ test_value(model1.type(), "TableModel", "Check void model type");
+
+ // Test value constructor
+ GModelSpectralTable model2(m_table, 2.0);
+ test_value(model2.filename().url(), m_table,
+ "Check file function data file name");
+ test_value(model2.norm(), 2.0);
+
+ // Test XML constructor
+ GXml xml(m_xml_model_point_table);
+ GXmlElement* element = xml.element(0)->element(0)->element("spectrum", 0);
+ GModelSpectralTable model3(*element);
+ test_value(model3.size(), 3);
+ test_value(model3.type(), "TableModel", "Check model type");
+ test_value(model3.filename().url(), m_table,
+ "Check table model data file name");
+ test_value(model3.norm(), 1.0);
+
+ // Test filename method
+ //model3.filename(m_table);
+ //test_value(model3.filename().url(), m_table,
+ // "Check table model data file name");
+
+ // Test norm method
+ model3.norm(3.0);
+ test_value(model3.norm(), 3.0);
+
+ // Test operator access
+ /*
+ const char* strarray[] = {"Normalization"};
+ for (int i = 0; i < 1; ++i) {
+ std::string keyname(strarray[i]);
+ model3[keyname].remove_range(); // To allow setting of any value
+ model3[keyname].value(2.1);
+ model3[keyname].error(1.9);
+ model3[keyname].gradient(0.8);
+ test_value(model3[keyname].value(), 2.1);
+ test_value(model3[keyname].error(), 1.9);
+ test_value(model3[keyname].gradient(), 0.8);
+ }
+ */
+
+ // Exit test
+ return;
+}
+
+
/***********************************************************************//**
* @brief Test GModelSpectralComposite class
***************************************************************************/
diff --git a/test/test_GModel.hpp b/test/test_GModel.hpp
index 6a831e6..9b8cd0d 100644
--- a/test/test_GModel.hpp
+++ b/test/test_GModel.hpp
@@ -78,6 +78,7 @@ public:
void test_filefct(void);
void test_spectral_composite(void);
void test_spectral_model(void);
+ void test_table(void);
void test_temp_const(void);
void test_temp_lightcurve(void);
void test_temp_phasecurve(void);
@@ -109,6 +110,7 @@ private:
std::string m_map_file;
std::string m_cube_file;
std::string m_filefct;
+ std::string m_table;
std::string m_temp_lightcurve;
std::string m_temp_phasecurve;
std::string m_xml_file;
@@ -125,10 +127,11 @@ private:
std::string m_xml_model_point_smoothbplaw;
std::string m_xml_model_point_supeplaw;
std::string m_xml_model_point_logparabola;
- std::string m_xml_point_multiplicative;
- std::string m_xml_point_exponential;
std::string m_xml_model_point_nodes;
std::string m_xml_model_point_filefct;
+ std::string m_xml_model_point_table;
+ std::string m_xml_point_multiplicative;
+ std::string m_xml_point_exponential;
std::string m_xml_model_spectral_composite;
std::string m_xml_model_diffuse_const;
std::string m_xml_model_diffuse_cube;
diff --git a/test/test_GModel.py b/test/test_GModel.py
index 31a9b64..6da2885 100755
--- a/test/test_GModel.py
+++ b/test/test_GModel.py
@@ -147,6 +147,7 @@ class Test(gammalib.GPythonTestSuite):
test_support.pickeling(self, gammalib.GModelSpectralPlawPhotonFlux())
test_support.pickeling(self, gammalib.GModelSpectralSmoothBrokenPlaw())
test_support.pickeling(self, gammalib.GModelSpectralSuperExpPlaw())
+ test_support.pickeling(self, gammalib.GModelSpectralTable())
test_support.pickeling(self, gammalib.GModelTemporalConst())
test_support.pickeling(self, gammalib.GModelTemporalLightCurve())
test_support.pickeling(self, gammalib.GModelTemporalPhaseCurve())
@@ -175,6 +176,7 @@ class Test(gammalib.GPythonTestSuite):
lcrv = gammalib.GFilename(os.environ['TEST_DATA']+'/model_temporal_lightcurve.fits')
pcrv = gammalib.GFilename(os.environ['TEST_DATA']+'/model_temporal_phasecurve.fits')
cube = gammalib.GFilename(os.environ['TEST_DATA']+'/test_cube.fits')
+ table = gammalib.GFilename(os.environ['TEST_DATA']+'/model_point_table.fits')
dir = gammalib.GSkyDir()
# Perform pickeling tests of filled classes
@@ -212,6 +214,7 @@ class Test(gammalib.GPythonTestSuite):
test_support.pickeling(self, gammalib.GModelSpectralPlawPhotonFlux(1.0,-2.0,pivot,pivot))
test_support.pickeling(self, gammalib.GModelSpectralSmoothBrokenPlaw(1.0,-2.0,pivot,-2.1,pivot,0.9))
test_support.pickeling(self, gammalib.GModelSpectralSuperExpPlaw(1.0,-2.0,pivot,pivot,0.9))
+ test_support.pickeling(self, gammalib.GModelSpectralTable(table, 2.0))
test_support.pickeling(self, gammalib.GModelTemporalConst(cnst))
test_support.pickeling(self, gammalib.GModelTemporalLightCurve(lcrv, 2.0))
test_support.pickeling(self, gammalib.GModelTemporalPhaseCurve(pcrv, time, 0.5, 1.0, 1.0, 1.0, 2.0))