Open
Conversation
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Comment on lines
-23
to
+26
|
|
||
| df = pd.DataFrame({'BR': B.T[0], | ||
| 'BT': B.T[1], | ||
| 'BN': B.T[2], | ||
| '|B|': norm}, index = time) | ||
|
|
||
| return df | ||
|
|
||
| return pd.DataFrame( | ||
| {'BR': B.T[0], 'BT': B.T[1], 'BN': B.T[2], '|B|': norm}, index=time | ||
| ) |
Author
There was a problem hiding this comment.
Function cdf2df refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-131
to
+128
| if isinstance(arr[0], u.Quantity): | ||
| val_to_subtract = 360 * u.deg | ||
| else: | ||
| val_to_subtract = 360 | ||
| val_to_subtract = 360 * u.deg if isinstance(arr[0], u.Quantity) else 360 |
Author
There was a problem hiding this comment.
Function unwrap_lons refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
| num = np.around(num, decimals=0) | ||
| arr = np.linspace(val1, val2, int(num)+1) | ||
| return arr | ||
| return np.linspace(val1, val2, int(num)+1) |
Author
There was a problem hiding this comment.
Function get_linspace_arr refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-88
to
+87
| polar_img_arr = ndimage.map_coordinates(img_arr, polar_inds, order=1, cval=cval) | ||
| return polar_img_arr | ||
| return ndimage.map_coordinates(img_arr, polar_inds, order=1, cval=cval) |
Author
There was a problem hiding this comment.
Function cart_to_polar_v1 refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-135
to
+133
| polar_img_arr = ndimage.map_coordinates(img_arr, polar_inds, order=1, cval=cval) | ||
| return polar_img_arr | ||
| return ndimage.map_coordinates(img_arr, polar_inds, order=1, cval=cval) |
Author
There was a problem hiding this comment.
Function cart_to_polar refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-44
to
+41
| y = int(date[0:4]) | ||
| y = int(date[:4]) |
Author
There was a problem hiding this comment.
Function download_tswf refactored with the following changes:
- Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] [×2] (
remove-redundant-slice-index) - Convert for loop into list comprehension (
list-comprehension) - Replace manual loop counter with call to enumerate [×2] (
convert-to-enumerate)
This removes the following comments ( why? ):
# Dowloading with wget
Comment on lines
-122
to
+115
| E = np.dot(M, ww[0:2, :]) * 1e3 # transformation into SRF (Y-Z) in (mV/m) | ||
| return E | ||
| return np.dot(M, ww[0:2, :]) * 1e3 |
Author
There was a problem hiding this comment.
Function convert_to_SRF refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
This removes the following comments ( why? ):
# transformation into SRF (Y-Z) in (mV/m)
Comment on lines
-160
to
+152
| if sr > 300000: | ||
| fmax = 200000 | ||
| else: | ||
| fmax = 100000 | ||
| fmax = 200000 if sr > 300000 else 100000 |
Author
There was a problem hiding this comment.
Function plot_spectrum refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
| else: | ||
| norm=None | ||
|
|
||
| norm = colors.LogNorm(vmin=vmin, vmax=vmax) if lognorm and vmin>0. else None |
Author
There was a problem hiding this comment.
Function spectro_plot refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Comment on lines
-65
to
+79
|
|
||
| w1 = [i for i, j in enumerate(dets) if j == '1'] | ||
| w2 = [i for i, j in enumerate(dets) if j == '2'] | ||
| w3 = [i for i, j in enumerate(dets) if j == '3'] | ||
| w4 = [i for i, j in enumerate(dets) if j == '4'] | ||
|
|
||
|
|
||
| dm, loc = min((dm, loc) for (loc, dm) in enumerate([len(w1),len(w2),len(w3),len(w4)])) | ||
|
|
||
| mos_inx=np.zeros([dm, 4]) | ||
| t=Time(times) | ||
| #round times to nearest 20 minutes (gives better performance) | ||
| mj=t.mjd | ||
| mj=np.around((mj-mj[0])*1200) | ||
|
|
Author
There was a problem hiding this comment.
Found the following improvement in Function match_files:
| #create outputs | ||
| n=mos_inx.shape | ||
|
|
Author
There was a problem hiding this comment.
Found the following improvement in Function shi_mov_cube:
Comment on lines
-304
to
+404
| s=data.shape | ||
| #remove nan values | ||
| data[~np.isfinite(data)]=1 | ||
| inx=0 | ||
| s=data.shape | ||
| #remove nan values | ||
| data[~np.isfinite(data)]=1 | ||
| inx=0 | ||
|
|
||
| #if needed, establish bytescale | ||
| if vrange[0]==vrange[1]: | ||
| vrange=scale_cube(data) | ||
|
|
||
| #if desired by user, check for excessive pixels in each individual frame for bytescaling | ||
| if qcheck == True: | ||
| hdrs2=[] | ||
| print('Checking individual frames for quality...') | ||
| for i in range(s[0]): | ||
| ba=np.logical_and(data[i,:,:] <= vrange[1], data[i,:,:] >= vrange[0]) | ||
| cnt=np.count_nonzero(np.where(ba)[0]) | ||
| if cnt/(s[1]*s[2]) > .7: | ||
| if inx==0: | ||
| data2=data[i,:,:] | ||
| hdrs2.append(hdrs[i]) | ||
| inx+=1 | ||
| else: | ||
| data2=np.dstack((data2, data[i,:,:])) | ||
| hdrs2.append(hdrs[i]) | ||
| inx+=1 | ||
|
|
||
| data=np.transpose(data2, (2,0,1)) | ||
| hdrs=hdrs2 | ||
| print(inx, ' of ', s[0], ' frames used') | ||
|
|
||
| #if needed, establish bytescale | ||
| if vrange[0]==vrange[1]: | ||
| vrange=scale_cube(data) | ||
|
|
||
| #if desired by user, check for excessive pixels in each individual frame for bytescaling | ||
| if qcheck == True: | ||
| hdrs2=[] | ||
| print('Checking individual frames for quality...') | ||
| for i in range(s[0]): | ||
| ba=np.logical_and(data[i,:,:] <= vrange[1], data[i,:,:] >= vrange[0]) | ||
| cnt=np.count_nonzero(np.where(ba)[0]) | ||
| if cnt/(s[1]*s[2]) > .7: | ||
| if inx==0: | ||
| data2=data[i,:,:] | ||
| hdrs2.append(hdrs[i]) | ||
| inx+=1 | ||
| else: | ||
| data2=np.dstack((data2, data[i,:,:])) | ||
| hdrs2.append(hdrs[i]) | ||
| inx+=1 | ||
|
|
||
| data=np.transpose(data2, (2,0,1)) | ||
| hdrs=hdrs2 | ||
| print(inx, ' of ', s[0], ' frames used') | ||
|
|
||
| #if desired, write processed output fits files | ||
| if writefits == True: | ||
| print('Writing FITS files...') | ||
| for i in range(s[0]): | ||
| times=hdrs[i]['date-avg'] | ||
| x=hdrs[i]['filename'].find('solohi-') | ||
| pfilename=hdrs[i]['filename'][0:x+7]+'mft_'+times[0:4]+times[5:7]+times[8:13]+times[14:16]+times[17:19]+'_V00.fits' | ||
| hdrs[i]['filename']=pfilename | ||
| outdat=data[i,:,:].copy() | ||
| if scale == True: | ||
| outdat=(outdat-vrange[0])/(vrange[1]-vrange[0])*255 | ||
| outdat[outdat < 0]=0 | ||
| outdat[outdat > 255]=255 | ||
| htmp=fits.PrimaryHDU(outdat.astype(float), header=hdrs[i]) | ||
| htmp.writeto(savepath+pfilename, overwrite=True) | ||
| #set up the animation window | ||
| print('Launching animation...') | ||
| fig=plt.figure() | ||
| ax=plt.subplot() | ||
| if grid==False: | ||
| im=ax.imshow(data[0,:,:], origin='lower', vmin=vrange[0], vmax=vrange[1], cmap='gray') | ||
| plt.xticks([]) | ||
| plt.yticks([]) | ||
| plt.axis('off') | ||
| elif proj==True: | ||
| im=ax.imshow(data[0,:,:], origin='lower', vmin=vrange[0], vmax=vrange[1], cmap='gray', extent=[elongation[0], elongation[1], latitude[0], latitude[1]]) | ||
| ax.set_xlabel('HPC Elongation (Deg)') | ||
| ax.set_ylabel('HPC Latitude (Deg)') | ||
| ax.grid(color='white') | ||
| elif wcscor==True: | ||
| wcs=WCS(hdrs[0]) | ||
| ax=plt.subplot(projection=wcs) | ||
| im=ax.imshow(data[0,:,:], vmin=vrange[0], vmax=vrange[1], cmap='gray', origin='lower') | ||
| ax.grid(color='white') | ||
| ax.coords[0].set_format_unit(u.deg) | ||
| ax.coords[1].set_format_unit(u.deg) | ||
| else: | ||
| im=ax.imshow(data[0,:,:], origin='lower', vmin=vrange[0], vmax=vrange[1], cmap='gray') | ||
| ax.grid(color='white') | ||
|
|
||
| def init(): | ||
| if hdrs != '': | ||
| times=hdrs[0]['date-avg'] | ||
| ax.set_title(times) | ||
| else: | ||
| im.set_title='Frame: 0' | ||
| im.set_data(data[0,:,:]) | ||
| return im, ax | ||
|
|
||
| def animate(i, im=im, ax=ax): | ||
| if hdrs != '': | ||
| print('Rendering frame ', i+1, 'of', s[0]) | ||
| times=hdrs[i]['date-avg'] | ||
|
|
||
| if grid==True and wcscor==True and redrawwcs==True: | ||
| wcs=WCS(hdrs[i]) | ||
| ax=plt.subplot(projection=wcs) | ||
| im=ax.imshow(data[i,:,:], vmin=vrange[0], vmax=vrange[1], cmap='gray', origin='lower') | ||
| ax.grid(color='white') | ||
| ax.coords[0].set_format_unit(u.deg) | ||
| ax.coords[1].set_format_unit(u.deg) | ||
| else: | ||
| im.set_data(data[i,:,:]) | ||
| ax.set_title(times) | ||
| else: | ||
| ax.set_title('Frame: '+str(i)) | ||
| #animate cube and save the output. ffmpeg arugments can be changed as needed | ||
| anim = animation.FuncAnimation(fig, animate, init_func=init, frames=data.shape[0], interval=10, blit=True) | ||
| anim.save(moviepath+moviename, writer=animation.FFMpegWriter(fps=20, extra_args=["-crf", "25", "-s", "864x576", "-vcodec", "libx264"]), dpi=250) | ||
| if writefits == True: | ||
| print('Writing FITS files...') | ||
| for i in range(s[0]): | ||
| times=hdrs[i]['date-avg'] | ||
| x=hdrs[i]['filename'].find('solohi-') | ||
| pfilename = (hdrs[i]['filename'][:x + 7] + 'mft_' + times[:4] + times[5:7] + | ||
| times[8:13] + times[14:16] + times[17:19] + '_V00.fits') | ||
| hdrs[i]['filename']=pfilename | ||
| outdat=data[i,:,:].copy() | ||
| if scale == True: | ||
| outdat=(outdat-vrange[0])/(vrange[1]-vrange[0])*255 | ||
| outdat[outdat < 0]=0 | ||
| outdat[outdat > 255]=255 | ||
| htmp=fits.PrimaryHDU(outdat.astype(float), header=hdrs[i]) | ||
| htmp.writeto(savepath+pfilename, overwrite=True) | ||
| #set up the animation window | ||
| print('Launching animation...') | ||
| fig=plt.figure() | ||
| ax=plt.subplot() | ||
| if grid==False: | ||
| im=ax.imshow(data[0,:,:], origin='lower', vmin=vrange[0], vmax=vrange[1], cmap='gray') | ||
| plt.xticks([]) | ||
| plt.yticks([]) | ||
| plt.axis('off') | ||
| elif proj==True: | ||
| im=ax.imshow(data[0,:,:], origin='lower', vmin=vrange[0], vmax=vrange[1], cmap='gray', extent=[elongation[0], elongation[1], latitude[0], latitude[1]]) | ||
| ax.set_xlabel('HPC Elongation (Deg)') | ||
| ax.set_ylabel('HPC Latitude (Deg)') | ||
| ax.grid(color='white') | ||
| elif wcscor==True: | ||
| wcs=WCS(hdrs[0]) | ||
| ax=plt.subplot(projection=wcs) | ||
| im=ax.imshow(data[0,:,:], vmin=vrange[0], vmax=vrange[1], cmap='gray', origin='lower') | ||
| ax.grid(color='white') | ||
| ax.coords[0].set_format_unit(u.deg) | ||
| ax.coords[1].set_format_unit(u.deg) | ||
| else: | ||
| im=ax.imshow(data[0,:,:], origin='lower', vmin=vrange[0], vmax=vrange[1], cmap='gray') | ||
| ax.grid(color='white') | ||
|
|
||
| def init(): | ||
| if hdrs != '': | ||
| times=hdrs[0]['date-avg'] | ||
| ax.set_title(times) | ||
| else: | ||
| im.set_title='Frame: 0' | ||
| im.set_data(data[0,:,:]) | ||
| return im, ax | ||
|
|
||
| def animate(i, im=im, ax=ax): | ||
| if hdrs != '': | ||
| print('Rendering frame ', i+1, 'of', s[0]) | ||
| times=hdrs[i]['date-avg'] | ||
|
|
||
| if grid==True and wcscor==True and redrawwcs==True: | ||
| wcs=WCS(hdrs[i]) | ||
| ax=plt.subplot(projection=wcs) | ||
| im=ax.imshow(data[i,:,:], vmin=vrange[0], vmax=vrange[1], cmap='gray', origin='lower') | ||
| ax.grid(color='white') | ||
| ax.coords[0].set_format_unit(u.deg) | ||
| ax.coords[1].set_format_unit(u.deg) | ||
| else: | ||
| im.set_data(data[i,:,:]) | ||
| ax.set_title(times) | ||
| else: | ||
| ax.set_title(f'Frame: {str(i)}') | ||
|
|
||
| #animate cube and save the output. ffmpeg arugments can be changed as needed | ||
| anim = animation.FuncAnimation(fig, animate, init_func=init, frames=data.shape[0], interval=10, blit=True) | ||
| anim.save(moviepath+moviename, writer=animation.FFMpegWriter(fps=20, extra_args=["-crf", "25", "-s", "864x576", "-vcodec", "libx264"]), dpi=250) |
Author
There was a problem hiding this comment.
Function run_movie refactored with the following changes:
- Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] [×2] (
remove-redundant-slice-index) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-469
to
+471
|
|
Author
There was a problem hiding this comment.
Found the following improvement in Function jframe:
Comment on lines
-524
to
+584
| if vrange[0]==vrange[1]: | ||
| vrange=scale_cube(data) | ||
| s=jmov.shape | ||
| #determine the time span of the whole data cube | ||
| t1=Time(hdrs[0]['date-avg']).mjd | ||
| t2=Time(hdrs[s[0]-1]['date-avg']).mjd | ||
| if outx/s[0] < 10: | ||
| outx=s[0]*10 | ||
| dsuns=np.zeros(s[0]) | ||
| #convert time span to mintes | ||
| tspan=(t2-t1)*24*60 | ||
| #get the pixels per minute in the x direction | ||
| ppm=(outx/tspan) | ||
| tcur=t1 | ||
| inx=0 | ||
| jimg=np.zeros([1000, outx]) | ||
| for i in range(s[0]): | ||
| #determine pixel space between files | ||
| if i < s[0]-1: | ||
| tnext=Time(hdrs[i+1]['date-avg']).mjd | ||
| pixw=int(((tnext-tcur)*24*60)*ppm) | ||
| tcur=tnext | ||
| else: | ||
| pixw=outx-1-inx | ||
| #get the spacecraft distance for each file | ||
| dsuns[i]=hdrs[i]['dsun_obs'] | ||
| #fill the output image with the signal from the current file at the right columns | ||
| jimg[:,inx:inx+pixw]=np.transpose(np.tile(np.median(jmov[i,:,int((pa-45)/90*1000-width/2):int((pa-45)/90*1000+width/2)], axis=1), (pixw,1))) | ||
| #increase the index of the current file | ||
| inx+=pixw | ||
| dsun_obs=np.mean(dsuns) | ||
| titleu='m' | ||
| #set the y-axis data of the current file | ||
| extent=[0, tspan/60, 5, 45] | ||
| if vrange[0]==vrange[1]: | ||
| vrange=scale_cube(data) | ||
| s=jmov.shape | ||
| #determine the time span of the whole data cube | ||
| t1=Time(hdrs[0]['date-avg']).mjd | ||
| t2=Time(hdrs[s[0]-1]['date-avg']).mjd | ||
| if outx/s[0] < 10: | ||
| outx=s[0]*10 | ||
| dsuns=np.zeros(s[0]) | ||
| #convert time span to mintes | ||
| tspan=(t2-t1)*24*60 | ||
| #get the pixels per minute in the x direction | ||
| ppm=(outx/tspan) | ||
| tcur=t1 | ||
| inx=0 | ||
| jimg=np.zeros([1000, outx]) | ||
| for i in range(s[0]): | ||
| #determine pixel space between files | ||
| if i < s[0]-1: | ||
| tnext=Time(hdrs[i+1]['date-avg']).mjd | ||
| pixw=int(((tnext-tcur)*24*60)*ppm) | ||
| tcur=tnext | ||
| else: | ||
| pixw=outx-1-inx | ||
| #get the spacecraft distance for each file | ||
| dsuns[i]=hdrs[i]['dsun_obs'] | ||
| #fill the output image with the signal from the current file at the right columns | ||
| jimg[:,inx:inx+pixw]=np.transpose(np.tile(np.median(jmov[i,:,int((pa-45)/90*1000-width/2):int((pa-45)/90*1000+width/2)], axis=1), (pixw,1))) | ||
| #increase the index of the current file | ||
| inx+=pixw | ||
| dsun_obs=np.mean(dsuns) | ||
| titleu='m' | ||
| #set the y-axis data of the current file | ||
| extent=[0, tspan/60, 5, 45] | ||
| #if unit is Rs, adjust dsun_obs anad convert elongations | ||
| if unit=='Rs' or unit=='Rsun' or unit=='RS' or unit=='RSUN': | ||
| dsun_obs=dsun_obs/695700000 | ||
| extent=[0, tspan/60, dsun_obs*math.sin(math.radians(5)), dsun_obs*math.sin(math.radians(45))] | ||
| titleu=unit | ||
| #if unit is au, adjust dsun_obs anad convert elongations | ||
| elif unit=='AU' or unit=='au': | ||
| dsun_obs=dsun_obs/149597870700 | ||
| extent=[0, tspan/60, dsun_obs*math.sin(math.radians(5)), dsun_obs*math.sin(math.radians(45))] | ||
| titleu=unit | ||
| #if unit is km, adjust dsun_obs anad convert elongations | ||
| elif unit=='KM' or unit=='km' or unit=='Km': | ||
| dsun_obs=dsun_obs/1000 | ||
| extent=[0, tspan/60, dsun_obs*math.sin(math.radians(5)), dsun_obs*math.sin(math.radians(45))] | ||
| titleu='km' | ||
| #if unit isn't recognized keep it in degrees | ||
| elif unit!= 'Deg' or unit != 'Degrees' or unit != 'DEG' or unit !='DEGREES': | ||
| print('Invalid unit, using elongation (degrees)') | ||
| #display the map | ||
| ax2=plt.subplot() | ||
| ax2.imshow(jimg, origin='lower', vmin=vrange[0], vmax=vrange[1], cmap='gray', extent=extent, aspect='auto') | ||
| #Set up the axes | ||
| ax2.set_xlabel('Hrs after Start Time: '+hdrs[0]['date-avg']) | ||
| ax2.set_ylabel(unit) | ||
| ax2.set_title('PA='+str(pa)+'\u00B0 Mean S/C Dist ='+str(round(dsun_obs, 3))+' '+titleu) | ||
| #return the image | ||
| return jimg | ||
| if unit in ['Rs', 'Rsun', 'RS', 'RSUN']: | ||
| dsun_obs=dsun_obs/695700000 | ||
| extent=[0, tspan/60, dsun_obs*math.sin(math.radians(5)), dsun_obs*math.sin(math.radians(45))] | ||
| titleu=unit | ||
| elif unit in ['AU', 'au']: | ||
| dsun_obs=dsun_obs/149597870700 | ||
| extent=[0, tspan/60, dsun_obs*math.sin(math.radians(5)), dsun_obs*math.sin(math.radians(45))] | ||
| titleu=unit | ||
| elif unit in ['KM', 'km', 'Km']: | ||
| dsun_obs=dsun_obs/1000 | ||
| extent=[0, tspan/60, dsun_obs*math.sin(math.radians(5)), dsun_obs*math.sin(math.radians(45))] | ||
| titleu='km' | ||
| else: | ||
| print('Invalid unit, using elongation (degrees)') | ||
| #display the map | ||
| ax2=plt.subplot() | ||
| ax2.imshow(jimg, origin='lower', vmin=vrange[0], vmax=vrange[1], cmap='gray', extent=extent, aspect='auto') | ||
| #Set up the axes | ||
| ax2.set_xlabel('Hrs after Start Time: '+hdrs[0]['date-avg']) | ||
| ax2.set_ylabel(unit) | ||
| ax2.set_title(f'PA={str(pa)}' + '\u00B0 Mean S/C Dist =' + | ||
| str(round(dsun_obs, 3)) + ' ' + titleu) | ||
| #return the image | ||
| return jimg |
Author
There was a problem hiding this comment.
Function make_jmap refactored with the following changes:
- Replace multiple comparisons of same variable with
inoperator [×3] (merge-comparisons) - Remove redundant conditional (
remove-redundant-if) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
This removes the following comments ( why? ):
#if unit isn't recognized keep it in degrees
#if unit is km, adjust dsun_obs anad convert elongations
#if unit is au, adjust dsun_obs anad convert elongations
Author
Sourcery Code Quality Report❌ Merging this PR will decrease code quality in the affected files by 0.04%.
Here are some functions in these files that still need a tune-up:
Legend and ExplanationThe emojis denote the absolute quality of the code:
The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request. Please see our documentation here for details on how these metrics are calculated. We are actively working on this report - lots more documentation and extra metrics to come! Help us improve this quality report! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Branch
mainrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
mainbranch, then run:Help us improve this pull request!