Commit b7262d0674741e3b41014b3e35f7b60432b1fc69
1 parent
b25aedc8
Remove underscores from test_support functions
Functions with underscores are considered protected, but these are not protected functions.
Showing
15 changed files
with
418 additions
and
418 deletions
inst/com/test/test_COM.py
| ... | ... | @@ -49,25 +49,25 @@ class Test(gammalib.GPythonTestSuite): |
| 49 | 49 | os.environ['CALDB'] = os.environ['TEST_COM_DATA']+'/../caldb' |
| 50 | 50 | |
| 51 | 51 | # Perform pickeling tests of empty classes |
| 52 | - test_support._pickeling(self, gammalib.GCOMD1Response()) | |
| 53 | - test_support._pickeling(self, gammalib.GCOMD2Response()) | |
| 54 | - test_support._pickeling(self, gammalib.GCOMDri()) | |
| 55 | - test_support._pickeling(self, gammalib.GCOMEventAtom()) | |
| 56 | - test_support._pickeling(self, gammalib.GCOMEventBin()) | |
| 57 | - test_support._pickeling(self, gammalib.GCOMEventCube()) | |
| 58 | - test_support._pickeling(self, gammalib.GCOMEventList()) | |
| 59 | - #test_support._pickeling(self, gammalib.GCOMIaq()) | |
| 60 | - #test_support._pickeling(self, gammalib.GCOMInstChars()) | |
| 61 | - test_support._pickeling(self, gammalib.GCOMInstDir()) | |
| 62 | - test_support._pickeling(self, gammalib.GCOMModelDRBFitting()) | |
| 63 | - test_support._pickeling(self, gammalib.GCOMOad()) | |
| 64 | - test_support._pickeling(self, gammalib.GCOMOads()) | |
| 65 | - test_support._pickeling(self, gammalib.GCOMObservation()) | |
| 66 | - test_support._pickeling(self, gammalib.GCOMResponse()) | |
| 67 | - test_support._pickeling(self, gammalib.GCOMRoi()) | |
| 68 | - #test_support._pickeling(self, gammalib.GCOMSelection()) | |
| 69 | - #test_support._pickeling(self, gammalib.GCOMStatus()) | |
| 70 | - test_support._pickeling(self, gammalib.GCOMTim()) | |
| 52 | + test_support.pickeling(self, gammalib.GCOMD1Response()) | |
| 53 | + test_support.pickeling(self, gammalib.GCOMD2Response()) | |
| 54 | + test_support.pickeling(self, gammalib.GCOMDri()) | |
| 55 | + test_support.pickeling(self, gammalib.GCOMEventAtom()) | |
| 56 | + test_support.pickeling(self, gammalib.GCOMEventBin()) | |
| 57 | + test_support.pickeling(self, gammalib.GCOMEventCube()) | |
| 58 | + test_support.pickeling(self, gammalib.GCOMEventList()) | |
| 59 | + #test_support.pickeling(self, gammalib.GCOMIaq()) | |
| 60 | + #test_support.pickeling(self, gammalib.GCOMInstChars()) | |
| 61 | + test_support.pickeling(self, gammalib.GCOMInstDir()) | |
| 62 | + test_support.pickeling(self, gammalib.GCOMModelDRBFitting()) | |
| 63 | + test_support.pickeling(self, gammalib.GCOMOad()) | |
| 64 | + test_support.pickeling(self, gammalib.GCOMOads()) | |
| 65 | + test_support.pickeling(self, gammalib.GCOMObservation()) | |
| 66 | + test_support.pickeling(self, gammalib.GCOMResponse()) | |
| 67 | + test_support.pickeling(self, gammalib.GCOMRoi()) | |
| 68 | + #test_support.pickeling(self, gammalib.GCOMSelection()) | |
| 69 | + #test_support.pickeling(self, gammalib.GCOMStatus()) | |
| 70 | + test_support.pickeling(self, gammalib.GCOMTim()) | |
| 71 | 71 | |
| 72 | 72 | # Setup test |
| 73 | 73 | caldb = gammalib.GCaldb('cgro','comptel') |
| ... | ... | @@ -128,25 +128,25 @@ class Test(gammalib.GPythonTestSuite): |
| 128 | 128 | dre.read(fits[0]) |
| 129 | 129 | |
| 130 | 130 | # Perform pickeling tests of filled classes |
| 131 | - test_support._pickeling(self, gammalib.GCOMD1Response(caldb,'DEFAULT')) | |
| 132 | - test_support._pickeling(self, gammalib.GCOMD2Response(caldb,'DEFAULT')) | |
| 133 | - test_support._pickeling(self, gammalib.GCOMDri(dri)) | |
| 134 | - test_support._pickeling(self, gammalib.GCOMEventAtom(atom)) | |
| 135 | - test_support._pickeling(self, gammalib.GCOMEventBin(bin)) | |
| 136 | - test_support._pickeling(self, gammalib.GCOMEventCube(dre)) | |
| 137 | - test_support._pickeling(self, gammalib.GCOMEventList(list)) | |
| 138 | - #test_support._pickeling(self, gammalib.GCOMIaq()) | |
| 139 | - #test_support._pickeling(self, gammalib.GCOMInstChars(caldb,'DEFAULT')) | |
| 140 | - test_support._pickeling(self, gammalib.GCOMInstDir(instdir)) | |
| 141 | - test_support._pickeling(self, gammalib.GCOMModelDRBFitting(model['Background'])) | |
| 142 | - test_support._pickeling(self, gammalib.GCOMOad(oad)) | |
| 143 | - test_support._pickeling(self, gammalib.GCOMOads(oads)) | |
| 144 | - test_support._pickeling(self, gammalib.GCOMObservation(obs[0])) | |
| 145 | - test_support._pickeling(self, gammalib.GCOMResponse(caldb, 'UNH(1.0-3.0)MeV')) | |
| 146 | - test_support._pickeling(self, gammalib.GCOMRoi(instdir, 10.0, 1.0, 5.0)) | |
| 147 | - #test_support._pickeling(self, gammalib.GCOMSelection()) | |
| 148 | - #test_support._pickeling(self, gammalib.GCOMStatus()) | |
| 149 | - test_support._pickeling(self, gammalib.GCOMTim(gti)) | |
| 131 | + test_support.pickeling(self, gammalib.GCOMD1Response(caldb,'DEFAULT')) | |
| 132 | + test_support.pickeling(self, gammalib.GCOMD2Response(caldb,'DEFAULT')) | |
| 133 | + test_support.pickeling(self, gammalib.GCOMDri(dri)) | |
| 134 | + test_support.pickeling(self, gammalib.GCOMEventAtom(atom)) | |
| 135 | + test_support.pickeling(self, gammalib.GCOMEventBin(bin)) | |
| 136 | + test_support.pickeling(self, gammalib.GCOMEventCube(dre)) | |
| 137 | + test_support.pickeling(self, gammalib.GCOMEventList(list)) | |
| 138 | + #test_support.pickeling(self, gammalib.GCOMIaq()) | |
| 139 | + #test_support.pickeling(self, gammalib.GCOMInstChars(caldb,'DEFAULT')) | |
| 140 | + test_support.pickeling(self, gammalib.GCOMInstDir(instdir)) | |
| 141 | + test_support.pickeling(self, gammalib.GCOMModelDRBFitting(model['Background'])) | |
| 142 | + test_support.pickeling(self, gammalib.GCOMOad(oad)) | |
| 143 | + test_support.pickeling(self, gammalib.GCOMOads(oads)) | |
| 144 | + test_support.pickeling(self, gammalib.GCOMObservation(obs[0])) | |
| 145 | + test_support.pickeling(self, gammalib.GCOMResponse(caldb, 'UNH(1.0-3.0)MeV')) | |
| 146 | + test_support.pickeling(self, gammalib.GCOMRoi(instdir, 10.0, 1.0, 5.0)) | |
| 147 | + #test_support.pickeling(self, gammalib.GCOMSelection()) | |
| 148 | + #test_support.pickeling(self, gammalib.GCOMStatus()) | |
| 149 | + test_support.pickeling(self, gammalib.GCOMTim(gti)) | |
| 150 | 150 | |
| 151 | 151 | # Return |
| 152 | 152 | return | ... | ... |
inst/cta/test/test_CTA.py
| ... | ... | @@ -99,7 +99,7 @@ class Test(gammalib.GPythonTestSuite): |
| 99 | 99 | list = self._setup_eventlist() |
| 100 | 100 | |
| 101 | 101 | # Perform event list access tests |
| 102 | - test_support._energy_container_access_index(self, list) | |
| 102 | + test_support.energy_container_access_index(self, list) | |
| 103 | 103 | |
| 104 | 104 | # Return |
| 105 | 105 | return |
| ... | ... | @@ -113,7 +113,7 @@ class Test(gammalib.GPythonTestSuite): |
| 113 | 113 | list = self._setup_eventlist() |
| 114 | 114 | |
| 115 | 115 | # Perform slicing tests |
| 116 | - test_support._energy_container_slicing(self, list) | |
| 116 | + test_support.energy_container_slicing(self, list) | |
| 117 | 117 | |
| 118 | 118 | # Return |
| 119 | 119 | return |
| ... | ... | @@ -376,44 +376,44 @@ class Test(gammalib.GPythonTestSuite): |
| 376 | 376 | os.environ['CALDB'] = os.environ['TEST_DATA']+'/caldb' |
| 377 | 377 | |
| 378 | 378 | # Perform pickeling tests of empty classes |
| 379 | - test_support._pickeling(self, gammalib.GCTAAeff2D()) | |
| 380 | - #test_support._pickeling(self, gammalib.GCTAAeffArf()) | |
| 381 | - #test_support._pickeling(self, gammalib.GCTAAeffPerfTable()) | |
| 382 | - test_support._pickeling(self, gammalib.GCTABackground3D()) | |
| 383 | - #test_support._pickeling(self, gammalib.GCTABackgroundPerfTable()) | |
| 384 | - test_support._pickeling(self, gammalib.GCTACubeBackground()) | |
| 385 | - test_support._pickeling(self, gammalib.GCTACubeEdisp()) | |
| 386 | - test_support._pickeling(self, gammalib.GCTACubeExposure()) | |
| 387 | - test_support._pickeling(self, gammalib.GCTACubePsf()) | |
| 388 | - #test_support._pickeling(self, gammalib.GCTACubeSourceDiffuse()) | |
| 389 | - #test_support._pickeling(self, gammalib.GCTACubeSourcePoint()) | |
| 390 | - test_support._pickeling(self, gammalib.GCTAEdisp2D()) | |
| 391 | - #test_support._pickeling(self, gammalib.GCTAEdispPerfTable()) | |
| 392 | - #test_support._pickeling(self, gammalib.GCTAEdispRmf()) | |
| 393 | - test_support._pickeling(self, gammalib.GCTAEventAtom()) | |
| 394 | - test_support._pickeling(self, gammalib.GCTAEventBin()) | |
| 395 | - test_support._pickeling(self, gammalib.GCTAEventCube()) | |
| 396 | - test_support._pickeling(self, gammalib.GCTAEventList()) | |
| 397 | - test_support._pickeling(self, gammalib.GCTAInstDir()) | |
| 398 | - test_support._pickeling(self, gammalib.GCTAModelAeffBackground()) | |
| 399 | - test_support._pickeling(self, gammalib.GCTAModelCubeBackground()) | |
| 400 | - test_support._pickeling(self, gammalib.GCTAModelIrfBackground()) | |
| 401 | - test_support._pickeling(self, gammalib.GCTAModelRadialAcceptance()) | |
| 402 | - test_support._pickeling(self, gammalib.GCTAModelRadialGauss()) | |
| 403 | - test_support._pickeling(self, gammalib.GCTAModelRadialPolynom()) | |
| 404 | - test_support._pickeling(self, gammalib.GCTAModelRadialProfile()) | |
| 405 | - test_support._pickeling(self, gammalib.GCTAObservation()) | |
| 406 | - test_support._pickeling(self, gammalib.GCTAOnOffObservation()) | |
| 407 | - test_support._pickeling(self, gammalib.GCTAPointing()) | |
| 408 | - test_support._pickeling(self, gammalib.GCTAPsf2D()) | |
| 409 | - test_support._pickeling(self, gammalib.GCTAPsfKing()) | |
| 410 | - #test_support._pickeling(self, gammalib.GCTAPsfPerfTable()) | |
| 411 | - test_support._pickeling(self, gammalib.GCTAPsfTable()) | |
| 412 | - #test_support._pickeling(self, gammalib.GCTAPsfVector()) | |
| 413 | - test_support._pickeling(self, gammalib.GCTAResponseCube()) | |
| 414 | - test_support._pickeling(self, gammalib.GCTAResponseIrf()) | |
| 415 | - test_support._pickeling(self, gammalib.GCTAResponseTable()) | |
| 416 | - test_support._pickeling(self, gammalib.GCTARoi()) | |
| 379 | + test_support.pickeling(self, gammalib.GCTAAeff2D()) | |
| 380 | + #test_support.pickeling(self, gammalib.GCTAAeffArf()) | |
| 381 | + #test_support.pickeling(self, gammalib.GCTAAeffPerfTable()) | |
| 382 | + test_support.pickeling(self, gammalib.GCTABackground3D()) | |
| 383 | + #test_support.pickeling(self, gammalib.GCTABackgroundPerfTable()) | |
| 384 | + test_support.pickeling(self, gammalib.GCTACubeBackground()) | |
| 385 | + test_support.pickeling(self, gammalib.GCTACubeEdisp()) | |
| 386 | + test_support.pickeling(self, gammalib.GCTACubeExposure()) | |
| 387 | + test_support.pickeling(self, gammalib.GCTACubePsf()) | |
| 388 | + #test_support.pickeling(self, gammalib.GCTACubeSourceDiffuse()) | |
| 389 | + #test_support.pickeling(self, gammalib.GCTACubeSourcePoint()) | |
| 390 | + test_support.pickeling(self, gammalib.GCTAEdisp2D()) | |
| 391 | + #test_support.pickeling(self, gammalib.GCTAEdispPerfTable()) | |
| 392 | + #test_support.pickeling(self, gammalib.GCTAEdispRmf()) | |
| 393 | + test_support.pickeling(self, gammalib.GCTAEventAtom()) | |
| 394 | + test_support.pickeling(self, gammalib.GCTAEventBin()) | |
| 395 | + test_support.pickeling(self, gammalib.GCTAEventCube()) | |
| 396 | + test_support.pickeling(self, gammalib.GCTAEventList()) | |
| 397 | + test_support.pickeling(self, gammalib.GCTAInstDir()) | |
| 398 | + test_support.pickeling(self, gammalib.GCTAModelAeffBackground()) | |
| 399 | + test_support.pickeling(self, gammalib.GCTAModelCubeBackground()) | |
| 400 | + test_support.pickeling(self, gammalib.GCTAModelIrfBackground()) | |
| 401 | + test_support.pickeling(self, gammalib.GCTAModelRadialAcceptance()) | |
| 402 | + test_support.pickeling(self, gammalib.GCTAModelRadialGauss()) | |
| 403 | + test_support.pickeling(self, gammalib.GCTAModelRadialPolynom()) | |
| 404 | + test_support.pickeling(self, gammalib.GCTAModelRadialProfile()) | |
| 405 | + test_support.pickeling(self, gammalib.GCTAObservation()) | |
| 406 | + test_support.pickeling(self, gammalib.GCTAOnOffObservation()) | |
| 407 | + test_support.pickeling(self, gammalib.GCTAPointing()) | |
| 408 | + test_support.pickeling(self, gammalib.GCTAPsf2D()) | |
| 409 | + test_support.pickeling(self, gammalib.GCTAPsfKing()) | |
| 410 | + #test_support.pickeling(self, gammalib.GCTAPsfPerfTable()) | |
| 411 | + test_support.pickeling(self, gammalib.GCTAPsfTable()) | |
| 412 | + #test_support.pickeling(self, gammalib.GCTAPsfVector()) | |
| 413 | + test_support.pickeling(self, gammalib.GCTAResponseCube()) | |
| 414 | + test_support.pickeling(self, gammalib.GCTAResponseIrf()) | |
| 415 | + test_support.pickeling(self, gammalib.GCTAResponseTable()) | |
| 416 | + test_support.pickeling(self, gammalib.GCTARoi()) | |
| 417 | 417 | |
| 418 | 418 | # Setup test |
| 419 | 419 | list = self._setup_eventlist() |
| ... | ... | @@ -469,48 +469,48 @@ class Test(gammalib.GPythonTestSuite): |
| 469 | 469 | kingname = self._caldb + '/prod1_king.fits' |
| 470 | 470 | |
| 471 | 471 | # Perform pickeling tests of filled classes |
| 472 | - test_support._pickeling(self, gammalib.GCTAAeff2D(irfname)) | |
| 473 | - #test_support._pickeling(self, gammalib.GCTAAeffArf()) | |
| 474 | - #test_support._pickeling(self, gammalib.GCTAAeffPerfTable()) | |
| 475 | - test_support._pickeling(self, gammalib.GCTABackground3D(irfname)) | |
| 476 | - #test_support._pickeling(self, gammalib.GCTABackgroundPerfTable()) | |
| 477 | - test_support._pickeling(self, gammalib.GCTACubeBackground(bgdcube)) | |
| 478 | - test_support._pickeling(self, gammalib.GCTACubeEdisp(edispcube)) | |
| 479 | - test_support._pickeling(self, gammalib.GCTACubeExposure(expcube)) | |
| 480 | - test_support._pickeling(self, gammalib.GCTACubePsf(psfcube)) | |
| 481 | - #test_support._pickeling(self, gammalib.GCTACubeSourceDiffuse()) | |
| 482 | - #test_support._pickeling(self, gammalib.GCTACubeSourcePoint()) | |
| 483 | - test_support._pickeling(self, gammalib.GCTAEdisp2D(irfname)) | |
| 484 | - #test_support._pickeling(self, gammalib.GCTAEdispPerfTable()) | |
| 485 | - #test_support._pickeling(self, gammalib.GCTAEdispRmf()) | |
| 486 | - test_support._pickeling(self, gammalib.GCTAEventAtom(atom)) | |
| 487 | - test_support._pickeling(self, gammalib.GCTAEventBin(bin)) | |
| 488 | - test_support._pickeling(self, gammalib.GCTAEventCube(cube)) | |
| 489 | - test_support._pickeling(self, gammalib.GCTAEventList(list)) | |
| 490 | - test_support._pickeling(self, gammalib.GCTAInstDir(instdir)) | |
| 491 | - test_support._pickeling(self, gammalib.GCTAModelAeffBackground(plaw)) | |
| 492 | - test_support._pickeling(self, gammalib.GCTAModelCubeBackground(plaw)) | |
| 493 | - test_support._pickeling(self, gammalib.GCTAModelIrfBackground(plaw)) | |
| 494 | - test_support._pickeling(self, gammalib.GCTAModelRadialAcceptance(radacc)) | |
| 495 | - test_support._pickeling(self, gammalib.GCTAModelRadialGauss(1.0)) | |
| 496 | - test_support._pickeling(self, gammalib.GCTAModelRadialPolynom([1.0,2.0])) | |
| 497 | - test_support._pickeling(self, gammalib.GCTAModelRadialProfile(1.0,2.0,3.0)) | |
| 498 | - test_support._pickeling(self, gammalib.GCTAObservation(obs1)) | |
| 499 | - test_support._pickeling(self, gammalib.GCTAObservation(obs2)) | |
| 500 | - test_support._pickeling(self, gammalib.GCTAObservation(obs3)) | |
| 501 | - test_support._pickeling(self, gammalib.GCTAObservation(obs4)) | |
| 502 | - test_support._pickeling(self, gammalib.GCTAOnOffObservation(obs5)) | |
| 503 | - test_support._pickeling(self, gammalib.GCTAPointing(dir)) | |
| 504 | - test_support._pickeling(self, gammalib.GCTAPsf2D(irfname)) | |
| 505 | - test_support._pickeling(self, gammalib.GCTAPsfKing(kingname)) | |
| 506 | - #test_support._pickeling(self, gammalib.GCTAPsfPerfTable()) | |
| 507 | - #test_support._pickeling(self, gammalib.GCTAPsfTable()) # No test data | |
| 508 | - #test_support._pickeling(self, gammalib.GCTAPsfVector()) | |
| 509 | - test_support._pickeling(self, gammalib.GCTAResponseCube(rspcube1)) | |
| 510 | - test_support._pickeling(self, gammalib.GCTAResponseCube(rspcube2)) | |
| 511 | - test_support._pickeling(self, gammalib.GCTAResponseIrf(rspirf)) | |
| 512 | - #test_support._pickeling(self, gammalib.GCTAResponseTable()) # No constructor | |
| 513 | - test_support._pickeling(self, gammalib.GCTARoi(instdir,2.0)) | |
| 472 | + test_support.pickeling(self, gammalib.GCTAAeff2D(irfname)) | |
| 473 | + #test_support.pickeling(self, gammalib.GCTAAeffArf()) | |
| 474 | + #test_support.pickeling(self, gammalib.GCTAAeffPerfTable()) | |
| 475 | + test_support.pickeling(self, gammalib.GCTABackground3D(irfname)) | |
| 476 | + #test_support.pickeling(self, gammalib.GCTABackgroundPerfTable()) | |
| 477 | + test_support.pickeling(self, gammalib.GCTACubeBackground(bgdcube)) | |
| 478 | + test_support.pickeling(self, gammalib.GCTACubeEdisp(edispcube)) | |
| 479 | + test_support.pickeling(self, gammalib.GCTACubeExposure(expcube)) | |
| 480 | + test_support.pickeling(self, gammalib.GCTACubePsf(psfcube)) | |
| 481 | + #test_support.pickeling(self, gammalib.GCTACubeSourceDiffuse()) | |
| 482 | + #test_support.pickeling(self, gammalib.GCTACubeSourcePoint()) | |
| 483 | + test_support.pickeling(self, gammalib.GCTAEdisp2D(irfname)) | |
| 484 | + #test_support.pickeling(self, gammalib.GCTAEdispPerfTable()) | |
| 485 | + #test_support.pickeling(self, gammalib.GCTAEdispRmf()) | |
| 486 | + test_support.pickeling(self, gammalib.GCTAEventAtom(atom)) | |
| 487 | + test_support.pickeling(self, gammalib.GCTAEventBin(bin)) | |
| 488 | + test_support.pickeling(self, gammalib.GCTAEventCube(cube)) | |
| 489 | + test_support.pickeling(self, gammalib.GCTAEventList(list)) | |
| 490 | + test_support.pickeling(self, gammalib.GCTAInstDir(instdir)) | |
| 491 | + test_support.pickeling(self, gammalib.GCTAModelAeffBackground(plaw)) | |
| 492 | + test_support.pickeling(self, gammalib.GCTAModelCubeBackground(plaw)) | |
| 493 | + test_support.pickeling(self, gammalib.GCTAModelIrfBackground(plaw)) | |
| 494 | + test_support.pickeling(self, gammalib.GCTAModelRadialAcceptance(radacc)) | |
| 495 | + test_support.pickeling(self, gammalib.GCTAModelRadialGauss(1.0)) | |
| 496 | + test_support.pickeling(self, gammalib.GCTAModelRadialPolynom([1.0,2.0])) | |
| 497 | + test_support.pickeling(self, gammalib.GCTAModelRadialProfile(1.0,2.0,3.0)) | |
| 498 | + test_support.pickeling(self, gammalib.GCTAObservation(obs1)) | |
| 499 | + test_support.pickeling(self, gammalib.GCTAObservation(obs2)) | |
| 500 | + test_support.pickeling(self, gammalib.GCTAObservation(obs3)) | |
| 501 | + test_support.pickeling(self, gammalib.GCTAObservation(obs4)) | |
| 502 | + test_support.pickeling(self, gammalib.GCTAOnOffObservation(obs5)) | |
| 503 | + test_support.pickeling(self, gammalib.GCTAPointing(dir)) | |
| 504 | + test_support.pickeling(self, gammalib.GCTAPsf2D(irfname)) | |
| 505 | + test_support.pickeling(self, gammalib.GCTAPsfKing(kingname)) | |
| 506 | + #test_support.pickeling(self, gammalib.GCTAPsfPerfTable()) | |
| 507 | + #test_support.pickeling(self, gammalib.GCTAPsfTable()) # No test data | |
| 508 | + #test_support.pickeling(self, gammalib.GCTAPsfVector()) | |
| 509 | + test_support.pickeling(self, gammalib.GCTAResponseCube(rspcube1)) | |
| 510 | + test_support.pickeling(self, gammalib.GCTAResponseCube(rspcube2)) | |
| 511 | + test_support.pickeling(self, gammalib.GCTAResponseIrf(rspirf)) | |
| 512 | + #test_support.pickeling(self, gammalib.GCTAResponseTable()) # No constructor | |
| 513 | + test_support.pickeling(self, gammalib.GCTARoi(instdir,2.0)) | |
| 514 | 514 | |
| 515 | 515 | # Return |
| 516 | 516 | return | ... | ... |
inst/lat/test/test_LAT.py
| ... | ... | @@ -69,7 +69,7 @@ class Test(gammalib.GPythonTestSuite): |
| 69 | 69 | list = self._setup_eventlist() |
| 70 | 70 | |
| 71 | 71 | # Perform event list access tests |
| 72 | - test_support._energy_container_access_index(self, list) | |
| 72 | + test_support.energy_container_access_index(self, list) | |
| 73 | 73 | |
| 74 | 74 | # Return |
| 75 | 75 | return |
| ... | ... | @@ -83,7 +83,7 @@ class Test(gammalib.GPythonTestSuite): |
| 83 | 83 | list = self._setup_eventlist() |
| 84 | 84 | |
| 85 | 85 | # Perform slicing tests |
| 86 | - test_support._energy_container_slicing(self, list) | |
| 86 | + test_support.energy_container_slicing(self, list) | |
| 87 | 87 | |
| 88 | 88 | # Return |
| 89 | 89 | return |
| ... | ... | @@ -97,18 +97,18 @@ class Test(gammalib.GPythonTestSuite): |
| 97 | 97 | os.environ['CALDB'] = os.environ['TEST_LAT_DATA']+'/../caldb' |
| 98 | 98 | |
| 99 | 99 | # Perform pickeling tests of empty classes |
| 100 | - test_support._pickeling(self, gammalib.GLATAeff()) | |
| 101 | - test_support._pickeling(self, gammalib.GLATEdisp()) | |
| 102 | - #test_support._pickeling(self, gammalib.GLATEventAtom()) | |
| 103 | - #test_support._pickeling(self, gammalib.GLATEventBin()) | |
| 104 | - test_support._pickeling(self, gammalib.GLATEventCube()) | |
| 105 | - test_support._pickeling(self, gammalib.GLATEventList()) | |
| 106 | - test_support._pickeling(self, gammalib.GLATInstDir()) | |
| 107 | - test_support._pickeling(self, gammalib.GLATLtCube()) | |
| 108 | - test_support._pickeling(self, gammalib.GLATObservation()) | |
| 109 | - test_support._pickeling(self, gammalib.GLATPsf()) | |
| 110 | - #test_support._pickeling(self, gammalib.GLATResponse()) | |
| 111 | - test_support._pickeling(self, gammalib.GLATRoi()) | |
| 100 | + test_support.pickeling(self, gammalib.GLATAeff()) | |
| 101 | + test_support.pickeling(self, gammalib.GLATEdisp()) | |
| 102 | + #test_support.pickeling(self, gammalib.GLATEventAtom()) | |
| 103 | + #test_support.pickeling(self, gammalib.GLATEventBin()) | |
| 104 | + test_support.pickeling(self, gammalib.GLATEventCube()) | |
| 105 | + test_support.pickeling(self, gammalib.GLATEventList()) | |
| 106 | + test_support.pickeling(self, gammalib.GLATInstDir()) | |
| 107 | + test_support.pickeling(self, gammalib.GLATLtCube()) | |
| 108 | + test_support.pickeling(self, gammalib.GLATObservation()) | |
| 109 | + test_support.pickeling(self, gammalib.GLATPsf()) | |
| 110 | + #test_support.pickeling(self, gammalib.GLATResponse()) | |
| 111 | + test_support.pickeling(self, gammalib.GLATRoi()) | |
| 112 | 112 | |
| 113 | 113 | # Setup test |
| 114 | 114 | datadir = os.environ['TEST_LAT_DATA'] + '/p8v2' |
| ... | ... | @@ -124,19 +124,19 @@ class Test(gammalib.GPythonTestSuite): |
| 124 | 124 | psf = os.environ['CALDB']+'/data/glast/lat/bcf/psf/psf_P8R2_SOURCE_V6_FB.fits' |
| 125 | 125 | |
| 126 | 126 | # Perform pickeling tests of filled classes |
| 127 | - test_support._pickeling(self, gammalib.GLATAeff(aeff,'FRONT')) | |
| 128 | - test_support._pickeling(self, gammalib.GLATEdisp(edisp,'FRONT')) | |
| 129 | - #test_support._pickeling(self, gammalib.GLATEventAtom()) | |
| 130 | - #test_support._pickeling(self, gammalib.GLATEventBin()) | |
| 131 | - test_support._pickeling(self, gammalib.GLATEventCube(eventcube)) | |
| 132 | - test_support._pickeling(self, gammalib.GLATEventList(eventlist)) | |
| 133 | - test_support._pickeling(self, gammalib.GLATInstDir(dir)) | |
| 134 | - test_support._pickeling(self, gammalib.GLATLtCube(ltcube)) | |
| 135 | - test_support._pickeling(self, gammalib.GLATObservation(unbinned[0])) | |
| 136 | - test_support._pickeling(self, gammalib.GLATObservation(binned[0])) | |
| 137 | - test_support._pickeling(self, gammalib.GLATPsf(psf,'FRONT')) | |
| 138 | - #test_support._pickeling(self, gammalib.GLATResponse()) | |
| 139 | - test_support._pickeling(self, gammalib.GLATRoi(instdir, 2.0)) | |
| 127 | + test_support.pickeling(self, gammalib.GLATAeff(aeff,'FRONT')) | |
| 128 | + test_support.pickeling(self, gammalib.GLATEdisp(edisp,'FRONT')) | |
| 129 | + #test_support.pickeling(self, gammalib.GLATEventAtom()) | |
| 130 | + #test_support.pickeling(self, gammalib.GLATEventBin()) | |
| 131 | + test_support.pickeling(self, gammalib.GLATEventCube(eventcube)) | |
| 132 | + test_support.pickeling(self, gammalib.GLATEventList(eventlist)) | |
| 133 | + test_support.pickeling(self, gammalib.GLATInstDir(dir)) | |
| 134 | + test_support.pickeling(self, gammalib.GLATLtCube(ltcube)) | |
| 135 | + test_support.pickeling(self, gammalib.GLATObservation(unbinned[0])) | |
| 136 | + test_support.pickeling(self, gammalib.GLATObservation(binned[0])) | |
| 137 | + test_support.pickeling(self, gammalib.GLATPsf(psf,'FRONT')) | |
| 138 | + #test_support.pickeling(self, gammalib.GLATResponse()) | |
| 139 | + test_support.pickeling(self, gammalib.GLATRoi(instdir, 2.0)) | |
| 140 | 140 | |
| 141 | 141 | # Return |
| 142 | 142 | return | ... | ... |
inst/mwl/test/test_MWL.py
| ... | ... | @@ -46,9 +46,9 @@ class Test(gammalib.GPythonTestSuite): |
| 46 | 46 | Test class pickeling |
| 47 | 47 | """ |
| 48 | 48 | # Perform pickeling tests of empty classes |
| 49 | - test_support._pickeling(self, gammalib.GMWLDatum()) | |
| 50 | - test_support._pickeling(self, gammalib.GMWLObservation()) | |
| 51 | - test_support._pickeling(self, gammalib.GMWLSpectrum()) | |
| 49 | + test_support.pickeling(self, gammalib.GMWLDatum()) | |
| 50 | + test_support.pickeling(self, gammalib.GMWLObservation()) | |
| 51 | + test_support.pickeling(self, gammalib.GMWLSpectrum()) | |
| 52 | 52 | |
| 53 | 53 | # Setup test |
| 54 | 54 | eng = gammalib.GEnergy(1.0, 'TeV') |
| ... | ... | @@ -57,9 +57,9 @@ class Test(gammalib.GPythonTestSuite): |
| 57 | 57 | spec = gammalib.GMWLSpectrum(os.environ['TEST_MWL_DATA']+'/crab_mwl.fits') |
| 58 | 58 | |
| 59 | 59 | # Perform pickeling tests of filled classes |
| 60 | - test_support._pickeling(self, gammalib.GMWLDatum(datum)) | |
| 61 | - test_support._pickeling(self, gammalib.GMWLObservation(obs)) | |
| 62 | - test_support._pickeling(self, gammalib.GMWLSpectrum(spec)) | |
| 60 | + test_support.pickeling(self, gammalib.GMWLDatum(datum)) | |
| 61 | + test_support.pickeling(self, gammalib.GMWLObservation(obs)) | |
| 62 | + test_support.pickeling(self, gammalib.GMWLSpectrum(spec)) | |
| 63 | 63 | |
| 64 | 64 | # Return |
| 65 | 65 | return | ... | ... |
test/test_GApplication.py
| ... | ... | @@ -380,7 +380,7 @@ class Test(gammalib.GPythonTestSuite): |
| 380 | 380 | pars = self._setup_pars() |
| 381 | 381 | |
| 382 | 382 | # Perform application parameter access tests |
| 383 | - test_support._container_access_index(self, pars) | |
| 383 | + test_support.container_access_index(self, pars) | |
| 384 | 384 | |
| 385 | 385 | # Check application parameter setting by index from start |
| 386 | 386 | par = gammalib.GApplicationPar('98','r','a','1.0','0.0','2.0','Dummy') |
| ... | ... | @@ -404,7 +404,7 @@ class Test(gammalib.GPythonTestSuite): |
| 404 | 404 | pars = self._setup_pars() |
| 405 | 405 | |
| 406 | 406 | # Perform slicing tests |
| 407 | - test_support._container_slicing(self, pars) | |
| 407 | + test_support.container_slicing(self, pars) | |
| 408 | 408 | |
| 409 | 409 | # Return |
| 410 | 410 | return |
| ... | ... | @@ -418,20 +418,20 @@ class Test(gammalib.GPythonTestSuite): |
| 418 | 418 | os.environ['PFILES'] = os.environ['TEST_DATA'] |
| 419 | 419 | |
| 420 | 420 | # Perform pickeling tests of empty classes |
| 421 | - test_support._pickeling(self, gammalib.GApplication()) | |
| 422 | - test_support._pickeling(self, gammalib.GApplicationPar()) | |
| 423 | - test_support._pickeling(self, gammalib.GApplicationPars()) | |
| 424 | - #test_support._pickeling(self, gammalib.GLog()) | |
| 421 | + test_support.pickeling(self, gammalib.GApplication()) | |
| 422 | + test_support.pickeling(self, gammalib.GApplicationPar()) | |
| 423 | + test_support.pickeling(self, gammalib.GApplicationPars()) | |
| 424 | + #test_support.pickeling(self, gammalib.GLog()) | |
| 425 | 425 | |
| 426 | 426 | # Setup for tests |
| 427 | 427 | par = gammalib.GApplicationPar('Test','r','a','1.0','0.0','2.0','Dummy text') |
| 428 | 428 | app = gammalib.GApplication('test_GApplication', '1.1.0') |
| 429 | 429 | |
| 430 | 430 | # Perform pickeling tests of filled classes |
| 431 | - test_support._pickeling(self, gammalib.GApplication(app)) | |
| 432 | - test_support._pickeling(self, gammalib.GApplicationPar(par)) | |
| 433 | - test_support._pickeling(self, gammalib.GApplicationPars('test_GApplication.par')) | |
| 434 | - #test_support._pickeling(self, gammalib.GLog()) | |
| 431 | + test_support.pickeling(self, gammalib.GApplication(app)) | |
| 432 | + test_support.pickeling(self, gammalib.GApplicationPar(par)) | |
| 433 | + test_support.pickeling(self, gammalib.GApplicationPars('test_GApplication.par')) | |
| 434 | + #test_support.pickeling(self, gammalib.GLog()) | |
| 435 | 435 | |
| 436 | 436 | # Return |
| 437 | 437 | return | ... | ... |
test/test_GFits.py
| ... | ... | @@ -620,33 +620,33 @@ class Test(gammalib.GPythonTestSuite): |
| 620 | 620 | Test class pickeling |
| 621 | 621 | """ |
| 622 | 622 | # Perform pickeling tests of empty classes |
| 623 | - test_support._pickeling(self, gammalib.GFits()) | |
| 624 | - test_support._pickeling(self, gammalib.GFitsAsciiTable()) | |
| 625 | - test_support._pickeling(self, gammalib.GFitsBinTable()) | |
| 626 | - test_support._pickeling(self, gammalib.GFitsHeader()) | |
| 627 | - test_support._pickeling(self, gammalib.GFitsHeaderCard()) | |
| 628 | - test_support._pickeling(self, gammalib.GFitsImageByte()) | |
| 629 | - test_support._pickeling(self, gammalib.GFitsImageDouble()) | |
| 630 | - test_support._pickeling(self, gammalib.GFitsImageFloat()) | |
| 631 | - test_support._pickeling(self, gammalib.GFitsImageLong()) | |
| 632 | - test_support._pickeling(self, gammalib.GFitsImageLongLong()) | |
| 633 | - test_support._pickeling(self, gammalib.GFitsImageSByte()) | |
| 634 | - test_support._pickeling(self, gammalib.GFitsImageShort()) | |
| 635 | - test_support._pickeling(self, gammalib.GFitsImageULong()) | |
| 636 | - test_support._pickeling(self, gammalib.GFitsImageUShort()) | |
| 637 | - test_support._pickeling(self, gammalib.GFitsTableBitCol()) | |
| 638 | - test_support._pickeling(self, gammalib.GFitsTableBoolCol()) | |
| 639 | - test_support._pickeling(self, gammalib.GFitsTableByteCol()) | |
| 640 | - #test_support._pickeling(self, gammalib.GFitsTableCDoubleCol()) | |
| 641 | - #test_support._pickeling(self, gammalib.GFitsTableCFloatCol()) | |
| 642 | - test_support._pickeling(self, gammalib.GFitsTableDoubleCol()) | |
| 643 | - test_support._pickeling(self, gammalib.GFitsTableFloatCol()) | |
| 644 | - test_support._pickeling(self, gammalib.GFitsTableLongCol()) | |
| 645 | - test_support._pickeling(self, gammalib.GFitsTableLongLongCol()) | |
| 646 | - test_support._pickeling(self, gammalib.GFitsTableShortCol()) | |
| 647 | - test_support._pickeling(self, gammalib.GFitsTableStringCol()) | |
| 648 | - test_support._pickeling(self, gammalib.GFitsTableULongCol()) | |
| 649 | - test_support._pickeling(self, gammalib.GFitsTableUShortCol()) | |
| 623 | + test_support.pickeling(self, gammalib.GFits()) | |
| 624 | + test_support.pickeling(self, gammalib.GFitsAsciiTable()) | |
| 625 | + test_support.pickeling(self, gammalib.GFitsBinTable()) | |
| 626 | + test_support.pickeling(self, gammalib.GFitsHeader()) | |
| 627 | + test_support.pickeling(self, gammalib.GFitsHeaderCard()) | |
| 628 | + test_support.pickeling(self, gammalib.GFitsImageByte()) | |
| 629 | + test_support.pickeling(self, gammalib.GFitsImageDouble()) | |
| 630 | + test_support.pickeling(self, gammalib.GFitsImageFloat()) | |
| 631 | + test_support.pickeling(self, gammalib.GFitsImageLong()) | |
| 632 | + test_support.pickeling(self, gammalib.GFitsImageLongLong()) | |
| 633 | + test_support.pickeling(self, gammalib.GFitsImageSByte()) | |
| 634 | + test_support.pickeling(self, gammalib.GFitsImageShort()) | |
| 635 | + test_support.pickeling(self, gammalib.GFitsImageULong()) | |
| 636 | + test_support.pickeling(self, gammalib.GFitsImageUShort()) | |
| 637 | + test_support.pickeling(self, gammalib.GFitsTableBitCol()) | |
| 638 | + test_support.pickeling(self, gammalib.GFitsTableBoolCol()) | |
| 639 | + test_support.pickeling(self, gammalib.GFitsTableByteCol()) | |
| 640 | + #test_support.pickeling(self, gammalib.GFitsTableCDoubleCol()) | |
| 641 | + #test_support.pickeling(self, gammalib.GFitsTableCFloatCol()) | |
| 642 | + test_support.pickeling(self, gammalib.GFitsTableDoubleCol()) | |
| 643 | + test_support.pickeling(self, gammalib.GFitsTableFloatCol()) | |
| 644 | + test_support.pickeling(self, gammalib.GFitsTableLongCol()) | |
| 645 | + test_support.pickeling(self, gammalib.GFitsTableLongLongCol()) | |
| 646 | + test_support.pickeling(self, gammalib.GFitsTableShortCol()) | |
| 647 | + test_support.pickeling(self, gammalib.GFitsTableStringCol()) | |
| 648 | + test_support.pickeling(self, gammalib.GFitsTableULongCol()) | |
| 649 | + test_support.pickeling(self, gammalib.GFitsTableUShortCol()) | |
| 650 | 650 | |
| 651 | 651 | # Setup for tests |
| 652 | 652 | fits = gammalib.GFits(os.environ['TEST_DATA']+'/test_cube.fits') |
| ... | ... | @@ -684,33 +684,33 @@ class Test(gammalib.GPythonTestSuite): |
| 684 | 684 | col_string[row,col] = str(row*10+col) |
| 685 | 685 | |
| 686 | 686 | # Perform pickeling tests of filled classes |
| 687 | - test_support._pickeling(self, gammalib.GFits(fits)) | |
| 688 | - test_support._pickeling(self, gammalib.GFitsAsciiTable(3)) | |
| 689 | - test_support._pickeling(self, gammalib.GFitsBinTable(4)) | |
| 690 | - test_support._pickeling(self, gammalib.GFitsHeader(header)) | |
| 691 | - test_support._pickeling(self, gammalib.GFitsHeaderCard('key','value','deg','test')) | |
| 692 | - test_support._pickeling(self, gammalib.GFitsImageByte(2,2,[1,2,3,4])) | |
| 693 | - test_support._pickeling(self, gammalib.GFitsImageDouble(2,2,[1.0,2.0,3.0,4.0])) | |
| 694 | - test_support._pickeling(self, gammalib.GFitsImageFloat(2,2,[1.0,2.0,3.0,4.0])) | |
| 695 | - test_support._pickeling(self, gammalib.GFitsImageLong(2,2,[1,2,3,4])) | |
| 696 | - test_support._pickeling(self, gammalib.GFitsImageLongLong(2,2,[1,2,3,4])) | |
| 697 | - test_support._pickeling(self, gammalib.GFitsImageSByte(2,2,[1,2,3,4])) | |
| 698 | - test_support._pickeling(self, gammalib.GFitsImageShort([2,2],[1,2,3,4])) | |
| 699 | - test_support._pickeling(self, gammalib.GFitsImageULong(2,2,1,[1,2,3,4])) | |
| 700 | - test_support._pickeling(self, gammalib.GFitsImageUShort(3,[1,2,3])) | |
| 701 | - test_support._pickeling(self, gammalib.GFitsTableBitCol(col_bit)) | |
| 702 | - test_support._pickeling(self, gammalib.GFitsTableBoolCol(col_bool)) | |
| 703 | - test_support._pickeling(self, gammalib.GFitsTableByteCol(col_byte)) | |
| 704 | - #test_support._pickeling(self, gammalib.GFitsTableCDoubleCol()) | |
| 705 | - #test_support._pickeling(self, gammalib.GFitsTableCFloatCol()) | |
| 706 | - test_support._pickeling(self, gammalib.GFitsTableDoubleCol(col_double)) | |
| 707 | - test_support._pickeling(self, gammalib.GFitsTableFloatCol(col_float)) | |
| 708 | - test_support._pickeling(self, gammalib.GFitsTableLongCol(col_long)) | |
| 709 | - test_support._pickeling(self, gammalib.GFitsTableLongLongCol(col_llong)) | |
| 710 | - test_support._pickeling(self, gammalib.GFitsTableShortCol(col_short)) | |
| 711 | - test_support._pickeling(self, gammalib.GFitsTableStringCol(col_string)) | |
| 712 | - test_support._pickeling(self, gammalib.GFitsTableULongCol(col_ulong)) | |
| 713 | - test_support._pickeling(self, gammalib.GFitsTableUShortCol(col_ushort)) | |
| 687 | + test_support.pickeling(self, gammalib.GFits(fits)) | |
| 688 | + test_support.pickeling(self, gammalib.GFitsAsciiTable(3)) | |
| 689 | + test_support.pickeling(self, gammalib.GFitsBinTable(4)) | |
| 690 | + test_support.pickeling(self, gammalib.GFitsHeader(header)) | |
| 691 | + test_support.pickeling(self, gammalib.GFitsHeaderCard('key','value','deg','test')) | |
| 692 | + test_support.pickeling(self, gammalib.GFitsImageByte(2,2,[1,2,3,4])) | |
| 693 | + test_support.pickeling(self, gammalib.GFitsImageDouble(2,2,[1.0,2.0,3.0,4.0])) | |
| 694 | + test_support.pickeling(self, gammalib.GFitsImageFloat(2,2,[1.0,2.0,3.0,4.0])) | |
| 695 | + test_support.pickeling(self, gammalib.GFitsImageLong(2,2,[1,2,3,4])) | |
| 696 | + test_support.pickeling(self, gammalib.GFitsImageLongLong(2,2,[1,2,3,4])) | |
| 697 | + test_support.pickeling(self, gammalib.GFitsImageSByte(2,2,[1,2,3,4])) | |
| 698 | + test_support.pickeling(self, gammalib.GFitsImageShort([2,2],[1,2,3,4])) | |
| 699 | + test_support.pickeling(self, gammalib.GFitsImageULong(2,2,1,[1,2,3,4])) | |
| 700 | + test_support.pickeling(self, gammalib.GFitsImageUShort(3,[1,2,3])) | |
| 701 | + test_support.pickeling(self, gammalib.GFitsTableBitCol(col_bit)) | |
| 702 | + test_support.pickeling(self, gammalib.GFitsTableBoolCol(col_bool)) | |
| 703 | + test_support.pickeling(self, gammalib.GFitsTableByteCol(col_byte)) | |
| 704 | + #test_support.pickeling(self, gammalib.GFitsTableCDoubleCol()) | |
| 705 | + #test_support.pickeling(self, gammalib.GFitsTableCFloatCol()) | |
| 706 | + test_support.pickeling(self, gammalib.GFitsTableDoubleCol(col_double)) | |
| 707 | + test_support.pickeling(self, gammalib.GFitsTableFloatCol(col_float)) | |
| 708 | + test_support.pickeling(self, gammalib.GFitsTableLongCol(col_long)) | |
| 709 | + test_support.pickeling(self, gammalib.GFitsTableLongLongCol(col_llong)) | |
| 710 | + test_support.pickeling(self, gammalib.GFitsTableShortCol(col_short)) | |
| 711 | + test_support.pickeling(self, gammalib.GFitsTableStringCol(col_string)) | |
| 712 | + test_support.pickeling(self, gammalib.GFitsTableULongCol(col_ulong)) | |
| 713 | + test_support.pickeling(self, gammalib.GFitsTableUShortCol(col_ushort)) | |
| 714 | 714 | |
| 715 | 715 | # Return |
| 716 | 716 | return | ... | ... |
test/test_GModel.py
| ... | ... | @@ -70,7 +70,7 @@ class Test(gammalib.GPythonTestSuite): |
| 70 | 70 | model = gammalib.GModelSky() |
| 71 | 71 | |
| 72 | 72 | # Perform model access tests |
| 73 | - test_support._container_access_index(self, models) | |
| 73 | + test_support.container_access_index(self, models) | |
| 74 | 74 | |
| 75 | 75 | # Check model getting by name |
| 76 | 76 | self.test_value(models['7'].name(), '7') |
| ... | ... | @@ -102,7 +102,7 @@ class Test(gammalib.GPythonTestSuite): |
| 102 | 102 | models = self._setup_models() |
| 103 | 103 | |
| 104 | 104 | # Perform slicing tests |
| 105 | - test_support._container_slicing(self, models) | |
| 105 | + test_support.container_slicing(self, models) | |
| 106 | 106 | |
| 107 | 107 | # Return |
| 108 | 108 | return |
| ... | ... | @@ -113,42 +113,42 @@ class Test(gammalib.GPythonTestSuite): |
| 113 | 113 | Test class pickeling |
| 114 | 114 | """ |
| 115 | 115 | # Perform pickeling tests of empty classes |
| 116 | - test_support._pickeling(self, gammalib.GModelPar()) | |
| 117 | - test_support._pickeling(self, gammalib.GModels()) | |
| 118 | - test_support._pickeling(self, gammalib.GModelSky()) | |
| 119 | - test_support._pickeling(self, gammalib.GModelSpatialComposite()) | |
| 120 | - test_support._pickeling(self, gammalib.GModelSpatialDiffuseConst()) | |
| 121 | - test_support._pickeling(self, gammalib.GModelSpatialDiffuseCube()) | |
| 122 | - test_support._pickeling(self, gammalib.GModelSpatialDiffuseMap()) | |
| 123 | - test_support._pickeling(self, gammalib.GModelSpatialEllipticalDisk()) | |
| 124 | - test_support._pickeling(self, gammalib.GModelSpatialEllipticalGauss()) | |
| 125 | - test_support._pickeling(self, gammalib.GModelSpatialPointSource()) | |
| 126 | - test_support._pickeling(self, gammalib.GModelSpatialRadialDisk()) | |
| 127 | - test_support._pickeling(self, gammalib.GModelSpatialRadialGauss()) | |
| 128 | - test_support._pickeling(self, gammalib.GModelSpatialRadialProfileDMBurkert()) | |
| 129 | - test_support._pickeling(self, gammalib.GModelSpatialRadialProfileDMEinasto()) | |
| 130 | - test_support._pickeling(self, gammalib.GModelSpatialRadialProfileDMZhao()) | |
| 131 | - test_support._pickeling(self, gammalib.GModelSpatialRadialProfileGauss()) | |
| 132 | - test_support._pickeling(self, gammalib.GModelSpatialRadialShell()) | |
| 133 | - test_support._pickeling(self, gammalib.GModelSpectralBrokenPlaw()) | |
| 134 | - test_support._pickeling(self, gammalib.GModelSpectralComposite()) | |
| 135 | - test_support._pickeling(self, gammalib.GModelSpectralConst()) | |
| 136 | - test_support._pickeling(self, gammalib.GModelSpectralExpInvPlaw()) | |
| 137 | - test_support._pickeling(self, gammalib.GModelSpectralExponential()) | |
| 138 | - test_support._pickeling(self, gammalib.GModelSpectralExpPlaw()) | |
| 139 | - test_support._pickeling(self, gammalib.GModelSpectralFunc()) | |
| 140 | - test_support._pickeling(self, gammalib.GModelSpectralGauss()) | |
| 141 | - test_support._pickeling(self, gammalib.GModelSpectralLogParabola()) | |
| 142 | - test_support._pickeling(self, gammalib.GModelSpectralMultiplicative()) | |
| 143 | - test_support._pickeling(self, gammalib.GModelSpectralNodes()) | |
| 144 | - test_support._pickeling(self, gammalib.GModelSpectralPlaw()) | |
| 145 | - test_support._pickeling(self, gammalib.GModelSpectralPlawEnergyFlux()) | |
| 146 | - test_support._pickeling(self, gammalib.GModelSpectralPlawPhotonFlux()) | |
| 147 | - test_support._pickeling(self, gammalib.GModelSpectralSmoothBrokenPlaw()) | |
| 148 | - test_support._pickeling(self, gammalib.GModelSpectralSuperExpPlaw()) | |
| 149 | - test_support._pickeling(self, gammalib.GModelTemporalConst()) | |
| 150 | - test_support._pickeling(self, gammalib.GModelTemporalLightCurve()) | |
| 151 | - test_support._pickeling(self, gammalib.GModelTemporalPhaseCurve()) | |
| 116 | + test_support.pickeling(self, gammalib.GModelPar()) | |
| 117 | + test_support.pickeling(self, gammalib.GModels()) | |
| 118 | + test_support.pickeling(self, gammalib.GModelSky()) | |
| 119 | + test_support.pickeling(self, gammalib.GModelSpatialComposite()) | |
| 120 | + test_support.pickeling(self, gammalib.GModelSpatialDiffuseConst()) | |
| 121 | + test_support.pickeling(self, gammalib.GModelSpatialDiffuseCube()) | |
| 122 | + test_support.pickeling(self, gammalib.GModelSpatialDiffuseMap()) | |
| 123 | + test_support.pickeling(self, gammalib.GModelSpatialEllipticalDisk()) | |
| 124 | + test_support.pickeling(self, gammalib.GModelSpatialEllipticalGauss()) | |
| 125 | + test_support.pickeling(self, gammalib.GModelSpatialPointSource()) | |
| 126 | + test_support.pickeling(self, gammalib.GModelSpatialRadialDisk()) | |
| 127 | + test_support.pickeling(self, gammalib.GModelSpatialRadialGauss()) | |
| 128 | + test_support.pickeling(self, gammalib.GModelSpatialRadialProfileDMBurkert()) | |
| 129 | + test_support.pickeling(self, gammalib.GModelSpatialRadialProfileDMEinasto()) | |
| 130 | + test_support.pickeling(self, gammalib.GModelSpatialRadialProfileDMZhao()) | |
| 131 | + test_support.pickeling(self, gammalib.GModelSpatialRadialProfileGauss()) | |
| 132 | + test_support.pickeling(self, gammalib.GModelSpatialRadialShell()) | |
| 133 | + test_support.pickeling(self, gammalib.GModelSpectralBrokenPlaw()) | |
| 134 | + test_support.pickeling(self, gammalib.GModelSpectralComposite()) | |
| 135 | + test_support.pickeling(self, gammalib.GModelSpectralConst()) | |
| 136 | + test_support.pickeling(self, gammalib.GModelSpectralExpInvPlaw()) | |
| 137 | + test_support.pickeling(self, gammalib.GModelSpectralExponential()) | |
| 138 | + test_support.pickeling(self, gammalib.GModelSpectralExpPlaw()) | |
| 139 | + test_support.pickeling(self, gammalib.GModelSpectralFunc()) | |
| 140 | + test_support.pickeling(self, gammalib.GModelSpectralGauss()) | |
| 141 | + test_support.pickeling(self, gammalib.GModelSpectralLogParabola()) | |
| 142 | + test_support.pickeling(self, gammalib.GModelSpectralMultiplicative()) | |
| 143 | + test_support.pickeling(self, gammalib.GModelSpectralNodes()) | |
| 144 | + test_support.pickeling(self, gammalib.GModelSpectralPlaw()) | |
| 145 | + test_support.pickeling(self, gammalib.GModelSpectralPlawEnergyFlux()) | |
| 146 | + test_support.pickeling(self, gammalib.GModelSpectralPlawPhotonFlux()) | |
| 147 | + test_support.pickeling(self, gammalib.GModelSpectralSmoothBrokenPlaw()) | |
| 148 | + test_support.pickeling(self, gammalib.GModelSpectralSuperExpPlaw()) | |
| 149 | + test_support.pickeling(self, gammalib.GModelTemporalConst()) | |
| 150 | + test_support.pickeling(self, gammalib.GModelTemporalLightCurve()) | |
| 151 | + test_support.pickeling(self, gammalib.GModelTemporalPhaseCurve()) | |
| 152 | 152 | |
| 153 | 153 | # Setup for tests |
| 154 | 154 | time = gammalib.GTime(1.0,'sec') |
| ... | ... | @@ -177,42 +177,42 @@ class Test(gammalib.GPythonTestSuite): |
| 177 | 177 | dir = gammalib.GSkyDir() |
| 178 | 178 | |
| 179 | 179 | # Perform pickeling tests of filled classes |
| 180 | - test_support._pickeling(self, gammalib.GModelPar('Par',2.0,5.0)) | |
| 181 | - test_support._pickeling(self, gammalib.GModels(self._setup_models())) | |
| 182 | - test_support._pickeling(self, gammalib.GModelSky(sky)) | |
| 183 | - test_support._pickeling(self, gammalib.GModelSpatialComposite(spacom)) | |
| 184 | - test_support._pickeling(self, gammalib.GModelSpatialDiffuseConst(2.0)) | |
| 185 | - test_support._pickeling(self, gammalib.GModelSpatialDiffuseCube(cube, 2.0)) | |
| 186 | - test_support._pickeling(self, gammalib.GModelSpatialDiffuseMap(cube,2.0)) | |
| 187 | - test_support._pickeling(self, gammalib.GModelSpatialEllipticalDisk(dir,0.2,0.3,45.0)) | |
| 188 | - test_support._pickeling(self, gammalib.GModelSpatialEllipticalGauss(dir,0.2,0.3,45.0)) | |
| 189 | - test_support._pickeling(self, gammalib.GModelSpatialPointSource(ptsrc)) | |
| 190 | - test_support._pickeling(self, gammalib.GModelSpatialRadialDisk(dir,0.2)) | |
| 191 | - test_support._pickeling(self, gammalib.GModelSpatialRadialGauss(dir,0.2)) | |
| 192 | - #test_support._pickeling(self, gammalib.GModelSpatialRadialProfileDMBurkert()) | |
| 193 | - #test_support._pickeling(self, gammalib.GModelSpatialRadialProfileDMEinasto()) | |
| 194 | - #test_support._pickeling(self, gammalib.GModelSpatialRadialProfileDMZhao()) | |
| 195 | - test_support._pickeling(self, gammalib.GModelSpatialRadialProfileGauss(dir,0.2)) | |
| 196 | - test_support._pickeling(self, gammalib.GModelSpatialRadialShell(dir,0.3,0.1)) | |
| 197 | - test_support._pickeling(self, gammalib.GModelSpectralBrokenPlaw(1.0,-2.0,pivot,-2.1)) | |
| 198 | - test_support._pickeling(self, gammalib.GModelSpectralComposite(specom)) | |
| 199 | - test_support._pickeling(self, gammalib.GModelSpectralConst(3.0)) | |
| 200 | - test_support._pickeling(self, gammalib.GModelSpectralExpInvPlaw(1.0,-2.0,pivot,0.9)) | |
| 201 | - test_support._pickeling(self, gammalib.GModelSpectralExponential(speexp)) | |
| 202 | - test_support._pickeling(self, gammalib.GModelSpectralExpPlaw(1.0,-2.0,pivot,pivot)) | |
| 203 | - test_support._pickeling(self, gammalib.GModelSpectralFunc(fct, 2.0)) | |
| 204 | - test_support._pickeling(self, gammalib.GModelSpectralGauss(1.0,pivot,pivot)) | |
| 205 | - test_support._pickeling(self, gammalib.GModelSpectralLogParabola(1.0,-2.0,pivot,0.9)) | |
| 206 | - test_support._pickeling(self, gammalib.GModelSpectralMultiplicative(spemul)) | |
| 207 | - test_support._pickeling(self, gammalib.GModelSpectralNodes(nodes)) | |
| 208 | - test_support._pickeling(self, gammalib.GModelSpectralPlaw(plaw)) | |
| 209 | - test_support._pickeling(self, gammalib.GModelSpectralPlawEnergyFlux(1.0,-2.0,pivot,pivot)) | |
| 210 | - test_support._pickeling(self, gammalib.GModelSpectralPlawPhotonFlux(1.0,-2.0,pivot,pivot)) | |
| 211 | - test_support._pickeling(self, gammalib.GModelSpectralSmoothBrokenPlaw(1.0,-2.0,pivot,-2.1,pivot,0.9)) | |
| 212 | - test_support._pickeling(self, gammalib.GModelSpectralSuperExpPlaw(1.0,-2.0,pivot,pivot,0.9)) | |
| 213 | - test_support._pickeling(self, gammalib.GModelTemporalConst(cnst)) | |
| 214 | - test_support._pickeling(self, gammalib.GModelTemporalLightCurve(lcrv, 2.0)) | |
| 215 | - test_support._pickeling(self, gammalib.GModelTemporalPhaseCurve(pcrv, time, 0.5, 1.0, 1.0, 1.0, 2.0)) | |
| 180 | + test_support.pickeling(self, gammalib.GModelPar('Par',2.0,5.0)) | |
| 181 | + test_support.pickeling(self, gammalib.GModels(self._setup_models())) | |
| 182 | + test_support.pickeling(self, gammalib.GModelSky(sky)) | |
| 183 | + test_support.pickeling(self, gammalib.GModelSpatialComposite(spacom)) | |
| 184 | + test_support.pickeling(self, gammalib.GModelSpatialDiffuseConst(2.0)) | |
| 185 | + test_support.pickeling(self, gammalib.GModelSpatialDiffuseCube(cube, 2.0)) | |
| 186 | + test_support.pickeling(self, gammalib.GModelSpatialDiffuseMap(cube,2.0)) | |
| 187 | + test_support.pickeling(self, gammalib.GModelSpatialEllipticalDisk(dir,0.2,0.3,45.0)) | |
| 188 | + test_support.pickeling(self, gammalib.GModelSpatialEllipticalGauss(dir,0.2,0.3,45.0)) | |
| 189 | + test_support.pickeling(self, gammalib.GModelSpatialPointSource(ptsrc)) | |
| 190 | + test_support.pickeling(self, gammalib.GModelSpatialRadialDisk(dir,0.2)) | |
| 191 | + test_support.pickeling(self, gammalib.GModelSpatialRadialGauss(dir,0.2)) | |
| 192 | + #test_support.pickeling(self, gammalib.GModelSpatialRadialProfileDMBurkert()) | |
| 193 | + #test_support.pickeling(self, gammalib.GModelSpatialRadialProfileDMEinasto()) | |
| 194 | + #test_support.pickeling(self, gammalib.GModelSpatialRadialProfileDMZhao()) | |
| 195 | + test_support.pickeling(self, gammalib.GModelSpatialRadialProfileGauss(dir,0.2)) | |
| 196 | + test_support.pickeling(self, gammalib.GModelSpatialRadialShell(dir,0.3,0.1)) | |
| 197 | + test_support.pickeling(self, gammalib.GModelSpectralBrokenPlaw(1.0,-2.0,pivot,-2.1)) | |
| 198 | + test_support.pickeling(self, gammalib.GModelSpectralComposite(specom)) | |
| 199 | + test_support.pickeling(self, gammalib.GModelSpectralConst(3.0)) | |
| 200 | + test_support.pickeling(self, gammalib.GModelSpectralExpInvPlaw(1.0,-2.0,pivot,0.9)) | |
| 201 | + test_support.pickeling(self, gammalib.GModelSpectralExponential(speexp)) | |
| 202 | + test_support.pickeling(self, gammalib.GModelSpectralExpPlaw(1.0,-2.0,pivot,pivot)) | |
| 203 | + test_support.pickeling(self, gammalib.GModelSpectralFunc(fct, 2.0)) | |
| 204 | + test_support.pickeling(self, gammalib.GModelSpectralGauss(1.0,pivot,pivot)) | |
| 205 | + test_support.pickeling(self, gammalib.GModelSpectralLogParabola(1.0,-2.0,pivot,0.9)) | |
| 206 | + test_support.pickeling(self, gammalib.GModelSpectralMultiplicative(spemul)) | |
| 207 | + test_support.pickeling(self, gammalib.GModelSpectralNodes(nodes)) | |
| 208 | + test_support.pickeling(self, gammalib.GModelSpectralPlaw(plaw)) | |
| 209 | + test_support.pickeling(self, gammalib.GModelSpectralPlawEnergyFlux(1.0,-2.0,pivot,pivot)) | |
| 210 | + test_support.pickeling(self, gammalib.GModelSpectralPlawPhotonFlux(1.0,-2.0,pivot,pivot)) | |
| 211 | + test_support.pickeling(self, gammalib.GModelSpectralSmoothBrokenPlaw(1.0,-2.0,pivot,-2.1,pivot,0.9)) | |
| 212 | + test_support.pickeling(self, gammalib.GModelSpectralSuperExpPlaw(1.0,-2.0,pivot,pivot,0.9)) | |
| 213 | + test_support.pickeling(self, gammalib.GModelTemporalConst(cnst)) | |
| 214 | + test_support.pickeling(self, gammalib.GModelTemporalLightCurve(lcrv, 2.0)) | |
| 215 | + test_support.pickeling(self, gammalib.GModelTemporalPhaseCurve(pcrv, time, 0.5, 1.0, 1.0, 1.0, 2.0)) | |
| 216 | 216 | |
| 217 | 217 | # Return |
| 218 | 218 | return | ... | ... |
test/test_GObservation.py
| ... | ... | @@ -675,7 +675,7 @@ class Test(gammalib.GPythonTestSuite): |
| 675 | 675 | photons = self._setup_photons() |
| 676 | 676 | |
| 677 | 677 | # Perform photons access tests |
| 678 | - test_support._energy_container_access_index(self, photons) | |
| 678 | + test_support.energy_container_access_index(self, photons) | |
| 679 | 679 | |
| 680 | 680 | # Return |
| 681 | 681 | return |
| ... | ... | @@ -689,7 +689,7 @@ class Test(gammalib.GPythonTestSuite): |
| 689 | 689 | photons = self._setup_photons() |
| 690 | 690 | |
| 691 | 691 | # Perform slicing tests |
| 692 | - test_support._energy_container_slicing(self, photons) | |
| 692 | + test_support.energy_container_slicing(self, photons) | |
| 693 | 693 | |
| 694 | 694 | # Return |
| 695 | 695 | return |
| ... | ... | @@ -704,7 +704,7 @@ class Test(gammalib.GPythonTestSuite): |
| 704 | 704 | run = gammalib.GCTAObservation() |
| 705 | 705 | |
| 706 | 706 | # Perform observation access tests |
| 707 | - test_support._container_access_index(self, obs) | |
| 707 | + test_support.container_access_index(self, obs) | |
| 708 | 708 | |
| 709 | 709 | # Return |
| 710 | 710 | return |
| ... | ... | @@ -718,7 +718,7 @@ class Test(gammalib.GPythonTestSuite): |
| 718 | 718 | obs = self._setup_obs() |
| 719 | 719 | |
| 720 | 720 | # Perform slicing tests |
| 721 | - test_support._container_slicing(self, obs) | |
| 721 | + test_support.container_slicing(self, obs) | |
| 722 | 722 | |
| 723 | 723 | # Perform additional slicing tests |
| 724 | 724 | self.test_value(len(obs[3:5].models()), 10) |
| ... | ... | @@ -739,19 +739,19 @@ class Test(gammalib.GPythonTestSuite): |
| 739 | 739 | Test class pickeling |
| 740 | 740 | """ |
| 741 | 741 | # Perform pickeling tests of empty classes |
| 742 | - test_support._pickeling(self, gammalib.GCaldb()) | |
| 743 | - test_support._pickeling(self, gammalib.GEbounds()) | |
| 744 | - test_support._pickeling(self, gammalib.GEnergy()) | |
| 745 | - test_support._pickeling(self, gammalib.GEnergies()) | |
| 746 | - test_support._pickeling(self, gammalib.GGti()) | |
| 747 | - test_support._pickeling(self, gammalib.GObservations()) | |
| 748 | - test_support._pickeling(self, gammalib.GPhases()) | |
| 749 | - test_support._pickeling(self, gammalib.GPhoton()) | |
| 750 | - test_support._pickeling(self, gammalib.GPhotons()) | |
| 751 | - test_support._pickeling(self, gammalib.GSource()) | |
| 752 | - test_support._pickeling(self, gammalib.GTime()) | |
| 753 | - test_support._pickeling(self, gammalib.GTimes()) | |
| 754 | - test_support._pickeling(self, gammalib.GTimeReference()) | |
| 742 | + test_support.pickeling(self, gammalib.GCaldb()) | |
| 743 | + test_support.pickeling(self, gammalib.GEbounds()) | |
| 744 | + test_support.pickeling(self, gammalib.GEnergy()) | |
| 745 | + test_support.pickeling(self, gammalib.GEnergies()) | |
| 746 | + test_support.pickeling(self, gammalib.GGti()) | |
| 747 | + test_support.pickeling(self, gammalib.GObservations()) | |
| 748 | + test_support.pickeling(self, gammalib.GPhases()) | |
| 749 | + test_support.pickeling(self, gammalib.GPhoton()) | |
| 750 | + test_support.pickeling(self, gammalib.GPhotons()) | |
| 751 | + test_support.pickeling(self, gammalib.GSource()) | |
| 752 | + test_support.pickeling(self, gammalib.GTime()) | |
| 753 | + test_support.pickeling(self, gammalib.GTimes()) | |
| 754 | + test_support.pickeling(self, gammalib.GTimeReference()) | |
| 755 | 755 | |
| 756 | 756 | # Setup for tests |
| 757 | 757 | dir = gammalib.GSkyDir() |
| ... | ... | @@ -768,19 +768,19 @@ class Test(gammalib.GPythonTestSuite): |
| 768 | 768 | times.append(tmax) |
| 769 | 769 | |
| 770 | 770 | # Perform pickeling tests of filled classes |
| 771 | - test_support._pickeling(self, gammalib.GCaldb('cta','prod2')) | |
| 772 | - test_support._pickeling(self, gammalib.GEbounds(10, emin, emax)) | |
| 773 | - test_support._pickeling(self, gammalib.GEnergy(emin)) | |
| 774 | - test_support._pickeling(self, gammalib.GEnergies(10, emin, emax)) | |
| 775 | - test_support._pickeling(self, gammalib.GGti(tmin, tmax)) | |
| 776 | - test_support._pickeling(self, gammalib.GObservations(self._setup_obs())) | |
| 777 | - test_support._pickeling(self, gammalib.GPhases(0.3, 0.7)) | |
| 778 | - test_support._pickeling(self, gammalib.GPhoton(dir, emin, tmin)) | |
| 779 | - test_support._pickeling(self, gammalib.GPhotons(photons)) | |
| 780 | - test_support._pickeling(self, gammalib.GSource('Crab', model, emin, tmin)) | |
| 781 | - test_support._pickeling(self, gammalib.GTime(tmin)) | |
| 782 | - test_support._pickeling(self, gammalib.GTimes(times)) | |
| 783 | - test_support._pickeling(self, gammalib.GTimeReference(12.345,'sec','utc','local')) | |
| 771 | + test_support.pickeling(self, gammalib.GCaldb('cta','prod2')) | |
| 772 | + test_support.pickeling(self, gammalib.GEbounds(10, emin, emax)) | |
| 773 | + test_support.pickeling(self, gammalib.GEnergy(emin)) | |
| 774 | + test_support.pickeling(self, gammalib.GEnergies(10, emin, emax)) | |
| 775 | + test_support.pickeling(self, gammalib.GGti(tmin, tmax)) | |
| 776 | + test_support.pickeling(self, gammalib.GObservations(self._setup_obs())) | |
| 777 | + test_support.pickeling(self, gammalib.GPhases(0.3, 0.7)) | |
| 778 | + test_support.pickeling(self, gammalib.GPhoton(dir, emin, tmin)) | |
| 779 | + test_support.pickeling(self, gammalib.GPhotons(photons)) | |
| 780 | + test_support.pickeling(self, gammalib.GSource('Crab', model, emin, tmin)) | |
| 781 | + test_support.pickeling(self, gammalib.GTime(tmin)) | |
| 782 | + test_support.pickeling(self, gammalib.GTimes(times)) | |
| 783 | + test_support.pickeling(self, gammalib.GTimeReference(12.345,'sec','utc','local')) | |
| 784 | 784 | |
| 785 | 785 | # Return |
| 786 | 786 | return | ... | ... |
test/test_GOptimizer.py
| ... | ... | @@ -69,7 +69,7 @@ class Test(gammalib.GPythonTestSuite): |
| 69 | 69 | par = gammalib.GOptimizerPar() |
| 70 | 70 | |
| 71 | 71 | # Perform GOptimizerPars access tests |
| 72 | - test_support._container_access_index(self, pars) | |
| 72 | + test_support.container_access_index(self, pars) | |
| 73 | 73 | |
| 74 | 74 | # Check parameter setting by index from start |
| 75 | 75 | par.name('98') |
| ... | ... | @@ -93,7 +93,7 @@ class Test(gammalib.GPythonTestSuite): |
| 93 | 93 | pars = self._setup_pars() |
| 94 | 94 | |
| 95 | 95 | # Perform slicing tests |
| 96 | - test_support._container_slicing(self, pars) | |
| 96 | + test_support.container_slicing(self, pars) | |
| 97 | 97 | |
| 98 | 98 | # Return |
| 99 | 99 | return |
| ... | ... | @@ -104,9 +104,9 @@ class Test(gammalib.GPythonTestSuite): |
| 104 | 104 | Test class pickeling |
| 105 | 105 | """ |
| 106 | 106 | # Perform pickeling tests of empty classes |
| 107 | - test_support._pickeling(self, gammalib.GOptimizerLM()) | |
| 108 | - test_support._pickeling(self, gammalib.GOptimizerPar()) | |
| 109 | - test_support._pickeling(self, gammalib.GOptimizerPars()) | |
| 107 | + test_support.pickeling(self, gammalib.GOptimizerLM()) | |
| 108 | + test_support.pickeling(self, gammalib.GOptimizerPar()) | |
| 109 | + test_support.pickeling(self, gammalib.GOptimizerPars()) | |
| 110 | 110 | |
| 111 | 111 | # Setup tests |
| 112 | 112 | pars = gammalib.GOptimizerPars() |
| ... | ... | @@ -116,9 +116,9 @@ class Test(gammalib.GPythonTestSuite): |
| 116 | 116 | opt.eps(0.1) |
| 117 | 117 | |
| 118 | 118 | # Perform pickeling tests of filled classes |
| 119 | - test_support._pickeling(self, gammalib.GOptimizerLM(opt)) | |
| 120 | - test_support._pickeling(self, gammalib.GOptimizerPar('Test', 2.1)) | |
| 121 | - test_support._pickeling(self, gammalib.GOptimizerPars(pars)) | |
| 119 | + test_support.pickeling(self, gammalib.GOptimizerLM(opt)) | |
| 120 | + test_support.pickeling(self, gammalib.GOptimizerPar('Test', 2.1)) | |
| 121 | + test_support.pickeling(self, gammalib.GOptimizerPars(pars)) | |
| 122 | 122 | |
| 123 | 123 | # Return |
| 124 | 124 | return | ... | ... |
test/test_GSky.py
| ... | ... | @@ -532,7 +532,7 @@ class Test(gammalib.GPythonTestSuite): |
| 532 | 532 | circle = gammalib.GSkyRegionCircle() |
| 533 | 533 | |
| 534 | 534 | # Perform regions access tests |
| 535 | - test_support._container_access_index(self, regions) | |
| 535 | + test_support.container_access_index(self, regions) | |
| 536 | 536 | |
| 537 | 537 | # Check regions setting by index from start |
| 538 | 538 | circle.name('98') |
| ... | ... | @@ -556,7 +556,7 @@ class Test(gammalib.GPythonTestSuite): |
| 556 | 556 | regions = self._setup_regions() |
| 557 | 557 | |
| 558 | 558 | # Perform slicing tests |
| 559 | - test_support._container_slicing(self, regions) | |
| 559 | + test_support.container_slicing(self, regions) | |
| 560 | 560 | |
| 561 | 561 | # Return |
| 562 | 562 | return |
| ... | ... | @@ -567,25 +567,25 @@ class Test(gammalib.GPythonTestSuite): |
| 567 | 567 | Test class pickeling |
| 568 | 568 | """ |
| 569 | 569 | # Perform pickeling tests of empty classes |
| 570 | - test_support._pickeling(self, gammalib.GHealpix()) | |
| 571 | - test_support._pickeling(self, gammalib.GHorizDir()) | |
| 572 | - test_support._pickeling(self, gammalib.GSkyDir()) | |
| 573 | - test_support._pickeling(self, gammalib.GSkyMap()) | |
| 574 | - test_support._pickeling(self, gammalib.GSkyPixel()) | |
| 575 | - test_support._pickeling(self, gammalib.GSkyRegionCircle()) | |
| 576 | - test_support._pickeling(self, gammalib.GSkyRegionMap()) | |
| 577 | - test_support._pickeling(self, gammalib.GSkyRegions()) | |
| 578 | - test_support._pickeling(self, gammalib.GWcsAIT()) | |
| 579 | - test_support._pickeling(self, gammalib.GWcsARC()) | |
| 580 | - test_support._pickeling(self, gammalib.GWcsAZP()) | |
| 581 | - test_support._pickeling(self, gammalib.GWcsCAR()) | |
| 582 | - test_support._pickeling(self, gammalib.GWcsGLS()) | |
| 583 | - test_support._pickeling(self, gammalib.GWcsMER()) | |
| 584 | - test_support._pickeling(self, gammalib.GWcsMOL()) | |
| 585 | - test_support._pickeling(self, gammalib.GWcsSFL()) | |
| 586 | - test_support._pickeling(self, gammalib.GWcsSIN()) | |
| 587 | - test_support._pickeling(self, gammalib.GWcsSTG()) | |
| 588 | - test_support._pickeling(self, gammalib.GWcsTAN()) | |
| 570 | + test_support.pickeling(self, gammalib.GHealpix()) | |
| 571 | + test_support.pickeling(self, gammalib.GHorizDir()) | |
| 572 | + test_support.pickeling(self, gammalib.GSkyDir()) | |
| 573 | + test_support.pickeling(self, gammalib.GSkyMap()) | |
| 574 | + test_support.pickeling(self, gammalib.GSkyPixel()) | |
| 575 | + test_support.pickeling(self, gammalib.GSkyRegionCircle()) | |
| 576 | + test_support.pickeling(self, gammalib.GSkyRegionMap()) | |
| 577 | + test_support.pickeling(self, gammalib.GSkyRegions()) | |
| 578 | + test_support.pickeling(self, gammalib.GWcsAIT()) | |
| 579 | + test_support.pickeling(self, gammalib.GWcsARC()) | |
| 580 | + test_support.pickeling(self, gammalib.GWcsAZP()) | |
| 581 | + test_support.pickeling(self, gammalib.GWcsCAR()) | |
| 582 | + test_support.pickeling(self, gammalib.GWcsGLS()) | |
| 583 | + test_support.pickeling(self, gammalib.GWcsMER()) | |
| 584 | + test_support.pickeling(self, gammalib.GWcsMOL()) | |
| 585 | + test_support.pickeling(self, gammalib.GWcsSFL()) | |
| 586 | + test_support.pickeling(self, gammalib.GWcsSIN()) | |
| 587 | + test_support.pickeling(self, gammalib.GWcsSTG()) | |
| 588 | + test_support.pickeling(self, gammalib.GWcsTAN()) | |
| 589 | 589 | |
| 590 | 590 | # Setup test |
| 591 | 591 | dir = gammalib.GSkyDir() |
| ... | ... | @@ -598,26 +598,26 @@ class Test(gammalib.GPythonTestSuite): |
| 598 | 598 | horizdir.altaz_deg(2.0, 3.0) |
| 599 | 599 | |
| 600 | 600 | # Perform pickeling tests of filled classes |
| 601 | - test_support._pickeling(self, gammalib.GHealpix(4)) | |
| 602 | - test_support._pickeling(self, horizdir) | |
| 603 | - test_support._pickeling(self, gammalib.GSkyDir(dir)) | |
| 604 | - test_support._pickeling(self, gammalib.GSkyMap(map)) | |
| 605 | - test_support._pickeling(self, gammalib.GSkyPixel(1.0)) | |
| 606 | - test_support._pickeling(self, gammalib.GSkyPixel(2.0,3.0)) | |
| 607 | - test_support._pickeling(self, gammalib.GSkyRegionCircle(dir,2.0)) | |
| 608 | - test_support._pickeling(self, gammalib.GSkyRegionMap(map)) | |
| 609 | - test_support._pickeling(self, gammalib.GSkyRegions(regions)) | |
| 610 | - test_support._pickeling(self, gammalib.GWcsAIT('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 611 | - test_support._pickeling(self, gammalib.GWcsARC('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 612 | - test_support._pickeling(self, gammalib.GWcsAZP('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 613 | - test_support._pickeling(self, gammalib.GWcsCAR('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 614 | - test_support._pickeling(self, gammalib.GWcsGLS('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 615 | - test_support._pickeling(self, gammalib.GWcsMER('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 616 | - test_support._pickeling(self, gammalib.GWcsMOL('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 617 | - test_support._pickeling(self, gammalib.GWcsSFL('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 618 | - test_support._pickeling(self, gammalib.GWcsSIN('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 619 | - test_support._pickeling(self, gammalib.GWcsSTG('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 620 | - test_support._pickeling(self, gammalib.GWcsTAN('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 601 | + test_support.pickeling(self, gammalib.GHealpix(4)) | |
| 602 | + test_support.pickeling(self, horizdir) | |
| 603 | + test_support.pickeling(self, gammalib.GSkyDir(dir)) | |
| 604 | + test_support.pickeling(self, gammalib.GSkyMap(map)) | |
| 605 | + test_support.pickeling(self, gammalib.GSkyPixel(1.0)) | |
| 606 | + test_support.pickeling(self, gammalib.GSkyPixel(2.0,3.0)) | |
| 607 | + test_support.pickeling(self, gammalib.GSkyRegionCircle(dir,2.0)) | |
| 608 | + test_support.pickeling(self, gammalib.GSkyRegionMap(map)) | |
| 609 | + test_support.pickeling(self, gammalib.GSkyRegions(regions)) | |
| 610 | + test_support.pickeling(self, gammalib.GWcsAIT('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 611 | + test_support.pickeling(self, gammalib.GWcsARC('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 612 | + test_support.pickeling(self, gammalib.GWcsAZP('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 613 | + test_support.pickeling(self, gammalib.GWcsCAR('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 614 | + test_support.pickeling(self, gammalib.GWcsGLS('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 615 | + test_support.pickeling(self, gammalib.GWcsMER('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 616 | + test_support.pickeling(self, gammalib.GWcsMOL('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 617 | + test_support.pickeling(self, gammalib.GWcsSFL('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 618 | + test_support.pickeling(self, gammalib.GWcsSIN('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 619 | + test_support.pickeling(self, gammalib.GWcsSTG('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 620 | + test_support.pickeling(self, gammalib.GWcsTAN('GAL',1.0,2.0,1.0,1.0,0.1,0.1)) | |
| 621 | 621 | |
| 622 | 622 | # Return |
| 623 | 623 | return | ... | ... |
test/test_GSupport.py
| ... | ... | @@ -286,24 +286,24 @@ class Test(gammalib.GPythonTestSuite): |
| 286 | 286 | Test class pickeling |
| 287 | 287 | """ |
| 288 | 288 | # Perform pickeling tests of empty classes |
| 289 | - #test_support._pickeling(self, gammalib.GBilinear()) | |
| 290 | - #test_support._pickeling(self, gammalib.GCsv()) | |
| 291 | - test_support._pickeling(self, gammalib.GFilename()) | |
| 292 | - #test_support._pickeling(self, gammalib.GNodeArray()) | |
| 293 | - #test_support._pickeling(self, gammalib.GRan()) | |
| 294 | - #test_support._pickeling(self, gammalib.GUrl()) | |
| 295 | - #test_support._pickeling(self, gammalib.GUrlFile()) | |
| 296 | - #test_support._pickeling(self, gammalib.GUrlString()) | |
| 289 | + #test_support.pickeling(self, gammalib.GBilinear()) | |
| 290 | + #test_support.pickeling(self, gammalib.GCsv()) | |
| 291 | + test_support.pickeling(self, gammalib.GFilename()) | |
| 292 | + #test_support.pickeling(self, gammalib.GNodeArray()) | |
| 293 | + #test_support.pickeling(self, gammalib.GRan()) | |
| 294 | + #test_support.pickeling(self, gammalib.GUrl()) | |
| 295 | + #test_support.pickeling(self, gammalib.GUrlFile()) | |
| 296 | + #test_support.pickeling(self, gammalib.GUrlString()) | |
| 297 | 297 | |
| 298 | 298 | # Perform pickeling tests of filled classes |
| 299 | - #test_support._pickeling(self, gammalib.GBilinear()) | |
| 300 | - #test_support._pickeling(self, gammalib.GCsv()) | |
| 301 | - test_support._pickeling(self, gammalib.GFilename('test.fits[URL]')) | |
| 302 | - #test_support._pickeling(self, gammalib.GNodeArray()) | |
| 303 | - #test_support._pickeling(self, gammalib.GRan()) | |
| 304 | - #test_support._pickeling(self, gammalib.GUrl()) | |
| 305 | - #test_support._pickeling(self, gammalib.GUrlFile()) | |
| 306 | - #test_support._pickeling(self, gammalib.GUrlString()) | |
| 299 | + #test_support.pickeling(self, gammalib.GBilinear()) | |
| 300 | + #test_support.pickeling(self, gammalib.GCsv()) | |
| 301 | + test_support.pickeling(self, gammalib.GFilename('test.fits[URL]')) | |
| 302 | + #test_support.pickeling(self, gammalib.GNodeArray()) | |
| 303 | + #test_support.pickeling(self, gammalib.GRan()) | |
| 304 | + #test_support.pickeling(self, gammalib.GUrl()) | |
| 305 | + #test_support.pickeling(self, gammalib.GUrlFile()) | |
| 306 | + #test_support.pickeling(self, gammalib.GUrlString()) | |
| 307 | 307 | |
| 308 | 308 | # Return |
| 309 | 309 | return | ... | ... |
test/test_GTest.py
| 1 | 1 | # ========================================================================== |
| 2 | 2 | # This module performs unit tests for the GammaLib test module. |
| 3 | 3 | # |
| 4 | -# Copyright (C) 2012-2017 Juergen Knoedlseder | |
| 4 | +# Copyright (C) 2012-2018 Juergen Knoedlseder | |
| 5 | 5 | # |
| 6 | 6 | # This program is free software: you can redistribute it and/or modify |
| 7 | 7 | # it under the terms of the GNU General Public License as published by |
| ... | ... | @@ -69,7 +69,7 @@ class Test(gammalib.GPythonTestSuite): |
| 69 | 69 | suite = gammalib.GPythonTestSuite() |
| 70 | 70 | |
| 71 | 71 | # Perform GTestSuites access tests |
| 72 | - test_support._container_access_index(self, suites) | |
| 72 | + test_support.container_access_index(self, suites) | |
| 73 | 73 | |
| 74 | 74 | # Check parameter setting by index from start |
| 75 | 75 | suite.name('98') |
| ... | ... | @@ -93,7 +93,7 @@ class Test(gammalib.GPythonTestSuite): |
| 93 | 93 | suites = self._setup_suites() |
| 94 | 94 | |
| 95 | 95 | # Perform slicing tests |
| 96 | - test_support._container_slicing(self, suites) | |
| 96 | + test_support.container_slicing(self, suites) | |
| 97 | 97 | |
| 98 | 98 | # Return |
| 99 | 99 | return | ... | ... |
test/test_GXml.py
| ... | ... | @@ -89,7 +89,7 @@ class Test(gammalib.GPythonTestSuite): |
| 89 | 89 | element = gammalib.GXmlElement() |
| 90 | 90 | |
| 91 | 91 | # Perform GXml access tests |
| 92 | - test_support._container_access_index(self, xml) | |
| 92 | + test_support.container_access_index(self, xml) | |
| 93 | 93 | |
| 94 | 94 | # Check parameter setting by index from start |
| 95 | 95 | element.name('98') |
| ... | ... | @@ -113,7 +113,7 @@ class Test(gammalib.GPythonTestSuite): |
| 113 | 113 | xml = self._setup_xml() |
| 114 | 114 | |
| 115 | 115 | # Perform slicing tests |
| 116 | - test_support._container_slicing(self, xml) | |
| 116 | + test_support.container_slicing(self, xml) | |
| 117 | 117 | |
| 118 | 118 | # Return |
| 119 | 119 | return |
| ... | ... | @@ -128,7 +128,7 @@ class Test(gammalib.GPythonTestSuite): |
| 128 | 128 | element = gammalib.GXmlElement() |
| 129 | 129 | |
| 130 | 130 | # Perform GXmlElement access tests |
| 131 | - test_support._container_access_index(self, elements) | |
| 131 | + test_support.container_access_index(self, elements) | |
| 132 | 132 | |
| 133 | 133 | # Check parameter setting by index from start |
| 134 | 134 | element.name('98') |
| ... | ... | @@ -152,7 +152,7 @@ class Test(gammalib.GPythonTestSuite): |
| 152 | 152 | elements = self._setup_elements() |
| 153 | 153 | |
| 154 | 154 | # Perform slicing tests |
| 155 | - test_support._container_slicing(self, elements) | |
| 155 | + test_support.container_slicing(self, elements) | |
| 156 | 156 | |
| 157 | 157 | # Return |
| 158 | 158 | return |
| ... | ... | @@ -163,22 +163,22 @@ class Test(gammalib.GPythonTestSuite): |
| 163 | 163 | Test class pickeling |
| 164 | 164 | """ |
| 165 | 165 | # Perform pickeling tests of empty classes |
| 166 | - test_support._pickeling(self, gammalib.GXml()) | |
| 167 | - test_support._pickeling(self, gammalib.GXmlAttribute()) | |
| 168 | - test_support._pickeling(self, gammalib.GXmlComment()) | |
| 169 | - test_support._pickeling(self, gammalib.GXmlDocument()) | |
| 170 | - test_support._pickeling(self, gammalib.GXmlElement()) | |
| 171 | - test_support._pickeling(self, gammalib.GXmlPI()) | |
| 172 | - test_support._pickeling(self, gammalib.GXmlText()) | |
| 166 | + test_support.pickeling(self, gammalib.GXml()) | |
| 167 | + test_support.pickeling(self, gammalib.GXmlAttribute()) | |
| 168 | + test_support.pickeling(self, gammalib.GXmlComment()) | |
| 169 | + test_support.pickeling(self, gammalib.GXmlDocument()) | |
| 170 | + test_support.pickeling(self, gammalib.GXmlElement()) | |
| 171 | + test_support.pickeling(self, gammalib.GXmlPI()) | |
| 172 | + test_support.pickeling(self, gammalib.GXmlText()) | |
| 173 | 173 | |
| 174 | 174 | # Perform pickeling tests of filled classes |
| 175 | - test_support._pickeling(self, gammalib.GXml('<?xml version="1.0" standalone="no"?><a>Text</a>')) | |
| 176 | - test_support._pickeling(self, gammalib.GXmlAttribute('name','value')) | |
| 177 | - test_support._pickeling(self, gammalib.GXmlComment('comment')) | |
| 178 | - test_support._pickeling(self, gammalib.GXmlDocument('test.xml','a','b','c')) | |
| 179 | - test_support._pickeling(self, gammalib.GXmlElement('a file="x"')) | |
| 180 | - test_support._pickeling(self, gammalib.GXmlPI('<?PI?>')) | |
| 181 | - test_support._pickeling(self, gammalib.GXmlText('Text')) | |
| 175 | + test_support.pickeling(self, gammalib.GXml('<?xml version="1.0" standalone="no"?><a>Text</a>')) | |
| 176 | + test_support.pickeling(self, gammalib.GXmlAttribute('name','value')) | |
| 177 | + test_support.pickeling(self, gammalib.GXmlComment('comment')) | |
| 178 | + test_support.pickeling(self, gammalib.GXmlDocument('test.xml','a','b','c')) | |
| 179 | + test_support.pickeling(self, gammalib.GXmlElement('a file="x"')) | |
| 180 | + test_support.pickeling(self, gammalib.GXmlPI('<?PI?>')) | |
| 181 | + test_support.pickeling(self, gammalib.GXmlText('Text')) | |
| 182 | 182 | |
| 183 | 183 | # Return |
| 184 | 184 | return | ... | ... |
test/test_GXspec.py
| ... | ... | @@ -110,9 +110,9 @@ class Test(gammalib.GPythonTestSuite): |
| 110 | 110 | Test class pickeling |
| 111 | 111 | """ |
| 112 | 112 | # Perform pickeling tests of empty classes |
| 113 | - test_support._pickeling(self, gammalib.GArf()) | |
| 114 | - test_support._pickeling(self, gammalib.GPha()) | |
| 115 | - test_support._pickeling(self, gammalib.GRmf()) | |
| 113 | + test_support.pickeling(self, gammalib.GArf()) | |
| 114 | + test_support.pickeling(self, gammalib.GPha()) | |
| 115 | + test_support.pickeling(self, gammalib.GRmf()) | |
| 116 | 116 | |
| 117 | 117 | # Setup test |
| 118 | 118 | emin = gammalib.GEnergy(1.0, 'TeV') |
| ... | ... | @@ -124,9 +124,9 @@ class Test(gammalib.GPythonTestSuite): |
| 124 | 124 | rmf = gammalib.GRmf(etrue, ereco) |
| 125 | 125 | |
| 126 | 126 | # Perform pickeling tests of filled classes |
| 127 | - test_support._pickeling(self, gammalib.GArf(arf)) | |
| 128 | - test_support._pickeling(self, gammalib.GPha(pha)) | |
| 129 | - test_support._pickeling(self, gammalib.GRmf(rmf)) | |
| 127 | + test_support.pickeling(self, gammalib.GArf(arf)) | |
| 128 | + test_support.pickeling(self, gammalib.GPha(pha)) | |
| 129 | + test_support.pickeling(self, gammalib.GRmf(rmf)) | |
| 130 | 130 | |
| 131 | 131 | # Return |
| 132 | 132 | return | ... | ... |
test/test_support.py
| ... | ... | @@ -24,7 +24,7 @@ import pickle |
| 24 | 24 | # ============================== # |
| 25 | 25 | # Test container access by index # |
| 26 | 26 | # ============================== # |
| 27 | -def _container_access_index(testsuite, container): | |
| 27 | +def container_access_index(testsuite, container): | |
| 28 | 28 | """ |
| 29 | 29 | Test container access by index |
| 30 | 30 | |
| ... | ... | @@ -72,7 +72,7 @@ def _container_access_index(testsuite, container): |
| 72 | 72 | # ===================================== # |
| 73 | 73 | # Test energy container access by index # |
| 74 | 74 | # ===================================== # |
| 75 | -def _energy_container_access_index(testsuite, container): | |
| 75 | +def energy_container_access_index(testsuite, container): | |
| 76 | 76 | """ |
| 77 | 77 | Test energy container access by index |
| 78 | 78 | |
| ... | ... | @@ -122,7 +122,7 @@ def _energy_container_access_index(testsuite, container): |
| 122 | 122 | # ====================== # |
| 123 | 123 | # Test container slicing # |
| 124 | 124 | # ====================== # |
| 125 | -def _container_slicing(testsuite, container): | |
| 125 | +def container_slicing(testsuite, container): | |
| 126 | 126 | """ |
| 127 | 127 | Test container slicing |
| 128 | 128 | |
| ... | ... | @@ -182,7 +182,7 @@ def _container_slicing(testsuite, container): |
| 182 | 182 | # ============================= # |
| 183 | 183 | # Test energy container slicing # |
| 184 | 184 | # ============================= # |
| 185 | -def _energy_container_slicing(testsuite, container): | |
| 185 | +def energy_container_slicing(testsuite, container): | |
| 186 | 186 | """ |
| 187 | 187 | Test energy container slicing |
| 188 | 188 | |
| ... | ... | @@ -242,7 +242,7 @@ def _energy_container_slicing(testsuite, container): |
| 242 | 242 | # ============== # |
| 243 | 243 | # Test pickeling # |
| 244 | 244 | # ============== # |
| 245 | -def _pickeling(testsuite, object): | |
| 245 | +def pickeling(testsuite, object): | |
| 246 | 246 | """ |
| 247 | 247 | Test class pickeling |
| 248 | 248 | ... | ... |