Skip to content

Commit

Permalink
remove filename of the args of pointingplotting
Browse files Browse the repository at this point in the history
  • Loading branch information
mseglar committed Jun 19, 2024
1 parent 0e574a9 commit fdc8be5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions tilepy/include/ObservationScheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def GetSchedule(obspar):
'%s/SuggestedPointings_GalProbOptimisation.txt' % dirName, obspar.name)
if(obspar.doPlot):
PointingPlotting(prob, obspar, name, dirName,
'%s/SuggestedPointings_GalProbOptimisation.txt' % dirName, obspar.name, filename, cat)
'%s/SuggestedPointings_GalProbOptimisation.txt' % dirName, obspar.name, cat)
else:
FOLLOWUP = False
print('No observations are scheduled')
Expand Down Expand Up @@ -139,7 +139,7 @@ def GetSchedule(obspar):
'%s/SuggestedPointings_2DProbOptimisation.txt' % dirName, obspar.name)
if(obspar.doPlot):
PointingPlotting(prob, obspar, name, dirName,
'%s/SuggestedPointings_2DProbOptimisation.txt' % dirName, obspar.name, filename, gal)
'%s/SuggestedPointings_2DProbOptimisation.txt' % dirName, obspar.name, gal)
else:
FOLLOWUP = False
print('No observations are scheduled')
Expand Down Expand Up @@ -213,8 +213,8 @@ def GetUniversalSchedule(obspar):
RankingTimes_2D(ObservationTime, prob, obspar[j], obspar[j].alertType, dirName,
'%s/SuggestedPointings_GWOptimisation_%s.txt' % (dirName, obspar[j].name), obspar[j].name)
PointingPlotting(prob, obspar[j], obspar[j].name, dirName, '%s/SuggestedPointings_GWOptimisation_%s.txt' % (
dirName, obspar[j].name), obspar[j].name, filename, cat)
PointingPlotting(prob, obspar[0], "all", dirName,'%s/SuggestedPointings_GWOptimisation.txt' % dirName, "all", filename, cat)
dirName, obspar[j].name), obspar[j].name, cat)
PointingPlotting(prob, obspar[0], "all", dirName,'%s/SuggestedPointings_GWOptimisation.txt' % dirName, "all", cat)
else:
FOLLOWUP = False
print('No observations are scheduled')
2 changes: 1 addition & 1 deletion tilepy/include/PointingPlotting.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def LoadPointings(tpointingFile):



def PointingPlotting(prob, obspar, name, dirName, PointingsFile1, ObsArray, filename, gal):
def PointingPlotting(prob, obspar, name, dirName, PointingsFile1, ObsArray, gal):
npix = len(prob)
nside = hp.npix2nside(npix)

Expand Down
4 changes: 2 additions & 2 deletions tilepy/tools/RankPlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ def RankPlot(skymap, alertType, obsTime, configDir, datasetDir, outDir, galcatNa
#RankingTimes_2D(ObservationTime, prob, obsparameters[j], obsparameters[j].alertType, dirName,
# '%s/SuggestedPointings_GWOptimisation_%s.txt' % (dirName, obsparameters[j].name), obsparameters[j].name)
PointingPlotting(prob, obsparameters[j], obsparameters[j].name, dirName, '%s/SuggestedPointings_GWOptimisation_%s.txt' % (
dirName, obsparameters[j].name), obsparameters[j].name, filename, tGals0)
dirName, obsparameters[j].name), obsparameters[j].name, tGals0)

PointingPlotting(prob, obsparameters[0], "all", dirName,
'%s/SuggestedPointings_GWOptimisation.txt' % dirName, "all", filename, tGals0)
'%s/SuggestedPointings_GWOptimisation.txt' % dirName, "all", tGals0)

0 comments on commit fdc8be5

Please sign in to comment.