[yt-svn] commit/yt: 4 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Fri Oct 10 12:02:07 PDT 2014
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/b19552cdf9d6/
Changeset: b19552cdf9d6
Branch: yt
User: hallman13
Date: 2014-10-10 15:17:05+00:00
Summary: Modified photon simulator to include new header keywords:
MISSION
RESPFILE
ANCRFILE
Affected #: 1 file
diff -r 7ae8714f591e4c724f7f635bcddb2377cf20b5b3 -r b19552cdf9d6f24e73f53f03beb11b3b43c07ffb yt/analysis_modules/photon_simulator/photon_simulator.py
--- a/yt/analysis_modules/photon_simulator/photon_simulator.py
+++ b/yt/analysis_modules/photon_simulator/photon_simulator.py
@@ -729,6 +729,7 @@
events[tblhdu.header["CHANTYPE"]] = dchannel.astype(int)
info = {"ChannelType" : tblhdu.header["CHANTYPE"],
+ "Mission" : tblhdu.header["MISSION"],
"Telescope" : tblhdu.header["TELESCOP"],
"Instrument" : tblhdu.header["INSTRUME"]}
@@ -789,6 +790,8 @@
parameters["ARF"] = f["/arf"].value
if "channel_type" in f:
parameters["ChannelType"] = f["/channel_type"].value
+ if "mission" in f:
+ parameters["Mission"] = f["/mission"].value
if "telescope" in f:
parameters["Telescope"] = f["/telescope"].value
if "instrument" in f:
@@ -831,6 +834,8 @@
parameters["ARF"] = tblhdu["ARF"]
if "CHANTYPE" in tblhdu.header:
parameters["ChannelType"] = tblhdu["CHANTYPE"]
+ if "MISSION" in tblhdu.header:
+ parameters["Mission"] = tblhdu["MISSION"]
if "TELESCOP" in tblhdu.header:
parameters["Telescope"] = tblhdu["TELESCOP"]
if "INSTRUME" in tblhdu.header:
@@ -920,11 +925,13 @@
tbhdu.header["RADECSYS"] = "FK5"
tbhdu.header["EQUINOX"] = 2000.0
if "RMF" in self.parameters:
- tbhdu.header["RMF"] = self.parameters["RMF"]
+ tbhdu.header["RESPFILE"] = self.parameters["RMF"]
if "ARF" in self.parameters:
- tbhdu.header["ARF"] = self.parameters["ARF"]
+ tbhdu.header["ANCRFILE"] = self.parameters["ARF"]
if "ChannelType" in self.parameters:
tbhdu.header["CHANTYPE"] = self.parameters["ChannelType"]
+ if "Mission" in self.parameters:
+ tbhdu.header["MISSION"] = self.parameters["Mission"]
if "Telescope" in self.parameters:
tbhdu.header["TELESCOP"] = self.parameters["Telescope"]
if "Instrument" in self.parameters:
@@ -1041,6 +1048,8 @@
f.create_dataset("/rmf", data=self.parameters["RMF"])
if "ChannelType" in self.parameters:
f.create_dataset("/channel_type", data=self.parameters["ChannelType"])
+ if "Mission" in self.parameters:
+ f.create_dataset("/mission", data=self.parameters["Mission"])
if "Telescope" in self.parameters:
f.create_dataset("/telescope", data=self.parameters["Telescope"])
if "Instrument" in self.parameters:
@@ -1209,6 +1218,10 @@
tbhdu.header["ANCRFILE"] = self.parameters["ARF"]
else:
tbhdu.header["ANCRFILE"] = "none"
+ if self.parameters.has_key("Mission"):
+ tbhdu.header["MISSION"] = self.parameters["Mission"]
+ else:
+ tbhdu.header["MISSION"] = "none"
if self.parameters.has_key("Telescope"):
tbhdu.header["TELESCOP"] = self.parameters["Telescope"]
else:
https://bitbucket.org/yt_analysis/yt/commits/8ed85f6a2a5b/
Changeset: 8ed85f6a2a5b
Branch: yt
User: hallman13
Date: 2014-10-10 17:30:21+00:00
Summary: fixed indents in the keyword addition lines for MISSION
Affected #: 1 file
diff -r b19552cdf9d6f24e73f53f03beb11b3b43c07ffb -r 8ed85f6a2a5b21bc527ed4469e93467c7d9abee4 yt/analysis_modules/photon_simulator/photon_simulator.py
--- a/yt/analysis_modules/photon_simulator/photon_simulator.py
+++ b/yt/analysis_modules/photon_simulator/photon_simulator.py
@@ -791,7 +791,7 @@
if "channel_type" in f:
parameters["ChannelType"] = f["/channel_type"].value
if "mission" in f:
- parameters["Mission"] = f["/mission"].value
+ parameters["Mission"] = f["/mission"].value
if "telescope" in f:
parameters["Telescope"] = f["/telescope"].value
if "instrument" in f:
@@ -835,7 +835,7 @@
if "CHANTYPE" in tblhdu.header:
parameters["ChannelType"] = tblhdu["CHANTYPE"]
if "MISSION" in tblhdu.header:
- parameters["Mission"] = tblhdu["MISSION"]
+ parameters["Mission"] = tblhdu["MISSION"]
if "TELESCOP" in tblhdu.header:
parameters["Telescope"] = tblhdu["TELESCOP"]
if "INSTRUME" in tblhdu.header:
@@ -931,7 +931,7 @@
if "ChannelType" in self.parameters:
tbhdu.header["CHANTYPE"] = self.parameters["ChannelType"]
if "Mission" in self.parameters:
- tbhdu.header["MISSION"] = self.parameters["Mission"]
+ tbhdu.header["MISSION"] = self.parameters["Mission"]
if "Telescope" in self.parameters:
tbhdu.header["TELESCOP"] = self.parameters["Telescope"]
if "Instrument" in self.parameters:
@@ -1049,7 +1049,7 @@
if "ChannelType" in self.parameters:
f.create_dataset("/channel_type", data=self.parameters["ChannelType"])
if "Mission" in self.parameters:
- f.create_dataset("/mission", data=self.parameters["Mission"])
+ f.create_dataset("/mission", data=self.parameters["Mission"])
if "Telescope" in self.parameters:
f.create_dataset("/telescope", data=self.parameters["Telescope"])
if "Instrument" in self.parameters:
@@ -1219,9 +1219,9 @@
else:
tbhdu.header["ANCRFILE"] = "none"
if self.parameters.has_key("Mission"):
- tbhdu.header["MISSION"] = self.parameters["Mission"]
+ tbhdu.header["MISSION"] = self.parameters["Mission"]
else:
- tbhdu.header["MISSION"] = "none"
+ tbhdu.header["MISSION"] = "none"
if self.parameters.has_key("Telescope"):
tbhdu.header["TELESCOP"] = self.parameters["Telescope"]
else:
https://bitbucket.org/yt_analysis/yt/commits/0c675e5d97a1/
Changeset: 0c675e5d97a1
Branch: yt
User: hallman13
Date: 2014-10-10 17:44:46+00:00
Summary: one other indent mistake. argh.
Affected #: 1 file
diff -r 8ed85f6a2a5b21bc527ed4469e93467c7d9abee4 -r 0c675e5d97a142cb1e0d546904a016116324f775 yt/analysis_modules/photon_simulator/photon_simulator.py
--- a/yt/analysis_modules/photon_simulator/photon_simulator.py
+++ b/yt/analysis_modules/photon_simulator/photon_simulator.py
@@ -1220,7 +1220,7 @@
tbhdu.header["ANCRFILE"] = "none"
if self.parameters.has_key("Mission"):
tbhdu.header["MISSION"] = self.parameters["Mission"]
- else:
+ else:
tbhdu.header["MISSION"] = "none"
if self.parameters.has_key("Telescope"):
tbhdu.header["TELESCOP"] = self.parameters["Telescope"]
https://bitbucket.org/yt_analysis/yt/commits/efbdf46a82e1/
Changeset: efbdf46a82e1
Branch: yt
User: jzuhone
Date: 2014-10-10 19:01:59+00:00
Summary: Merged in hallman13/yt-xrayevent (pull request #1249)
Modified photon simulator to include new header keywords:
Affected #: 1 file
diff -r 6a90354545227c4ce007caa2e3c697eb7a4f4b7d -r efbdf46a82e1052081d64f71c70654a0c8c36ef4 yt/analysis_modules/photon_simulator/photon_simulator.py
--- a/yt/analysis_modules/photon_simulator/photon_simulator.py
+++ b/yt/analysis_modules/photon_simulator/photon_simulator.py
@@ -729,6 +729,7 @@
events[tblhdu.header["CHANTYPE"]] = dchannel.astype(int)
info = {"ChannelType" : tblhdu.header["CHANTYPE"],
+ "Mission" : tblhdu.header["MISSION"],
"Telescope" : tblhdu.header["TELESCOP"],
"Instrument" : tblhdu.header["INSTRUME"]}
@@ -789,6 +790,8 @@
parameters["ARF"] = f["/arf"].value
if "channel_type" in f:
parameters["ChannelType"] = f["/channel_type"].value
+ if "mission" in f:
+ parameters["Mission"] = f["/mission"].value
if "telescope" in f:
parameters["Telescope"] = f["/telescope"].value
if "instrument" in f:
@@ -831,6 +834,8 @@
parameters["ARF"] = tblhdu["ARF"]
if "CHANTYPE" in tblhdu.header:
parameters["ChannelType"] = tblhdu["CHANTYPE"]
+ if "MISSION" in tblhdu.header:
+ parameters["Mission"] = tblhdu["MISSION"]
if "TELESCOP" in tblhdu.header:
parameters["Telescope"] = tblhdu["TELESCOP"]
if "INSTRUME" in tblhdu.header:
@@ -920,11 +925,13 @@
tbhdu.header["RADECSYS"] = "FK5"
tbhdu.header["EQUINOX"] = 2000.0
if "RMF" in self.parameters:
- tbhdu.header["RMF"] = self.parameters["RMF"]
+ tbhdu.header["RESPFILE"] = self.parameters["RMF"]
if "ARF" in self.parameters:
- tbhdu.header["ARF"] = self.parameters["ARF"]
+ tbhdu.header["ANCRFILE"] = self.parameters["ARF"]
if "ChannelType" in self.parameters:
tbhdu.header["CHANTYPE"] = self.parameters["ChannelType"]
+ if "Mission" in self.parameters:
+ tbhdu.header["MISSION"] = self.parameters["Mission"]
if "Telescope" in self.parameters:
tbhdu.header["TELESCOP"] = self.parameters["Telescope"]
if "Instrument" in self.parameters:
@@ -1041,6 +1048,8 @@
f.create_dataset("/rmf", data=self.parameters["RMF"])
if "ChannelType" in self.parameters:
f.create_dataset("/channel_type", data=self.parameters["ChannelType"])
+ if "Mission" in self.parameters:
+ f.create_dataset("/mission", data=self.parameters["Mission"])
if "Telescope" in self.parameters:
f.create_dataset("/telescope", data=self.parameters["Telescope"])
if "Instrument" in self.parameters:
@@ -1209,6 +1218,10 @@
tbhdu.header["ANCRFILE"] = self.parameters["ARF"]
else:
tbhdu.header["ANCRFILE"] = "none"
+ if self.parameters.has_key("Mission"):
+ tbhdu.header["MISSION"] = self.parameters["Mission"]
+ else:
+ tbhdu.header["MISSION"] = "none"
if self.parameters.has_key("Telescope"):
tbhdu.header["TELESCOP"] = self.parameters["Telescope"]
else:
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list