From 0457891b20d650c4b10ebcbd160582e52aa8d14e Mon Sep 17 00:00:00 2001 From: Tom Aldcroft Date: Mon, 17 Nov 2014 16:10:32 -0500 Subject: [PATCH] Add pitch bins and distinguish between ACIS-I, S for PSMC model --- xija/component/heat.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xija/component/heat.py b/xija/component/heat.py index 9d047619..7282b8ac 100644 --- a/xija/component/heat.py +++ b/xija/component/heat.py @@ -352,14 +352,15 @@ def __init__(self, model, node, pitch_comp, simz_comp, P_pitches=None, self.node = self.model.get_comp(node) self.pitch_comp = self.model.get_comp(pitch_comp) self.simz_comp = self.model.get_comp(simz_comp) - self.P_pitches = np.array([50., 90., 150.] if (P_pitches is None) + self.P_pitches = np.array([45., 55., 70., 90., 150.] if (P_pitches is None) else P_pitches, dtype=np.float) self.dPs = np.zeros_like(self.P_pitches) if dPs is None else np.array(dPs, dtype=np.float) self.simz_lims = ((-400000.0, -85000.0), # HRC-S (-85000.0, 0.0), # HRC-I - (0.0, 400000.0)) # ACIS + (0.0, 83000.0), # ACIS-S + (83000.0, 400000.0)) # ACIS-I - self.instr_names = ['hrcs', 'hrci', 'acis'] + self.instr_names = ['hrcs', 'hrci', 'aciss', 'acisi'] for i, instr_name in enumerate(self.instr_names): for j, pitch in enumerate(self.P_pitches): self.add_par('P_{0}_{1:d}'.format(instr_name, int(pitch)),