for d3d data mapping needs to be rotated

jnkh · jnkh · commit d5009a1b7d55 · 2017-12-14T02:22:41.000-05:00
diff --git a/data/signals.py b/data/signals.py
@@ -213,12 +213,12 @@ def fetch_nstx_data(signal_path,shot_num,c):
 'energydt':energydt,'ipdirect':ipdirect,'iptarget':iptarget,'iperr':iperr,
 #'tmamp1':tmamp1,'tmamp2':tmamp2,'tmfreq1':tmfreq1,'tmfreq2':tmfreq2,'pechin':pechin,
 # 'rho_profile_spatial':rho_profile_spatial,'etemp_profile_spatial':etemp_profile_spatial,'edens_profile_spatial':edens_profile_spatial,'etemp':etemp
-'etemp_profile':etemp_profile,'edens_profile':edens_profile}
-#'itemp_profile':itemp_profile,'zdens_profile':zdens_profile}
-#'trot_profile':trot_profile,'pthm_profile':pthm_profile,
-#'neut_profile':neut_profile,'q_profile':q_profile,
-#'bootstrap_current_profile':bootstrap_current_profile,
-#'q_psi_profile':q_psi_profile}
+'etemp_profile':etemp_profile,'edens_profile':edens_profile,
+'itemp_profile':itemp_profile,'zdens_profile':zdens_profile,
+'trot_profile':trot_profile,'pthm_profile':pthm_profile,
+'neut_profile':neut_profile,'q_profile':q_profile,
+'bootstrap_current_profile':bootstrap_current_profile,
+'q_psi_profile':q_psi_profile}
 #}
 
 #new signals are not downloaded yet
diff --git a/plasma/primitives/data.py b/plasma/primitives/data.py
@@ -220,14 +220,17 @@ def fetch_data(self,signal,shot_num,c):
             time,data,mapping,success = self.fetch_data_fn(path,shot_num,c)
             if mapping is not None and np.ndim(mapping) == 1:#make sure there is a mapping for every timestep
                 T = len(time)
-                mapping = np.tile(mapping,(T,1)) 
+                mapping = np.tile(mapping,(T,1)).transpose()
+		assert(mapping.shape == data.shape), "shape of mapping and data is different"
             if mapping_path is not None:#fetch the mapping separately
                 time_map,data_map,mapping_map,success_map = self.fetch_data_fn(mapping_path,shot_num,c)
-                assert(time == time_map), "time for signal {} and mapping {} don't align: \n{}\n\n{}\n".format(path,mapping_path,time,time_map)
                 success = (success and success_map)
                 if not success:
                     print("No success for signal {} and mapping {}".format(path,mapping_path))
-                mapping = data_map
+		    mapping = data
+		else:
+               	    assert(np.all(time == time_map)), "time for signal {} and mapping {} don't align: \n{}\n\n{}\n".format(path,mapping_path,time,time_map)
+                    mapping = data_map
 
         except Exception as e:
             time,data = create_missing_value_filler()
