radarsys Commit - r390:5670a70fd8d1 · Jicamarca Repository

Se resolvió plot pattern de ABS

Renato Huallpa -

r390:5670a70fd8d1

parent child

Context file:

r390:5670a70fd8d1

Collapse all files

.env +2 -2

             DOCKER_DATA=/data/dockers/radarsys/
             LOCAL_IP=192.168.1.128
-            MQTT_SERVER=10.10.10.200
+            # MQTT_SERVER=10.10.10.200
-            # MQTT_SERVER = 192.168.100.5
+            MQTT_SERVER = 192.168.100.5
             MQTT_PORT = 1883
             MQTT_KEEPALIVE = 3660

apps/abs/models.py +2 0

                         try:
                             #self.write_device()
                             send_task('task_change_beam', [self.id],)
+                            print("*************************RUNNING ABS**************************",flush=True)
                             self.message = 'ABS running'
                         except Exception as e:
                     self.device.status = 2
                     self.device.save()
                     self.message = 'ABS has been stopped.'
+                    print("*************************STOPPED ABS**************************",flush=True)
                     self.save()
                     return True

apps/abs/templates/abs_downpattern_img.html +1 -5

             {% load django_bootstrap5 %}
             {% load main_tags %}
-            {% block content %}
+            <img id="imgMainDown" src="{% url 'url_plot_beam' beam.abs_conf.id beam.id 'down' %}" alt="Error ploting..." style="width: 250px;height:250px; background-image: url({% static 'images/loader.gif' %});background-repeat: no-repeat;background-position: 50% 50%;">
-            <div id="PictureOverJRODown" style="float: right">
-              <img id="imgMainDown" src="{% url 'url_plot_beam' beam.abs_conf.id beam.id 'down' %}" alt="Error ploting..." style="width:340px;height:340px; background-image: url({% static 'images/loader.gif' %});background-repeat: no-repeat;background-position: 50% 50%;">
-            </div>
-            {% endblock %}

apps/abs/templates/abs_pattern.html +25 -7

@@ -122,7 +122,12
122	font-size: 95%;	122	font-size: 95%;
123	}	123	}
124		124
125		125	.image_plot {
		126	border: 2px solid #00334d;
		127	display: inline-block;
		128	vertical-align: 50px;
		129	margin-left: 10px;
		130	}
126		131
127	.abs_rx tr:nth-last-child(1){	132	.abs_rx tr:nth-last-child(1){
128	border-bottom: 0px solid #00334d;	133	border-bottom: 0px solid #00334d;
@@ -373,9 +378,16
373	</tr>	378	</tr>
374	</table>	379	</table>
375		380
376	{% if not edit %}	381	<table class="image_plot">
377	{% include "abs_uppattern_img.html" %}	382	<tr>
378	{% endif %}	383	<td>
		384	{% if not edit %}
		385	{% include "abs_uppattern_img.html" %}
		386	{% endif %}
		387	<!-- <img id="imgMains" src="{% url 'url_plot_beam' beam.abs_conf.id beam.id 'up' %}" alt="Error ploting..." style="width: 250px;height:250px; background-image: url({% static 'images/loader.gif' %});background-repeat: no-repeat;background-position: 50% 50%;"> -->
		388	</td>
		389	</tr>
		390	</table>
379		391
380	<br>	392	<br>
381		393
@@ -597,9 +609,15
597	</tr>	609	</tr>
598	</table>	610	</table>
599		611
600	{% if not edit %}	612	<table class="image_plot">
601	{% include "abs_downpattern_img.html" %}	613	<tr>
602	{% endif %}	614	<td>
		615	{% if not edit %}
		616	{% include "abs_downpattern_img.html" %}
		617	{% endif %}
		618	</td>
		619	</tr>
		620	</table>
603		621
604	<br>	622	<br>
605		623

apps/abs/templates/abs_patterns.html +1 -1

             <script>
             {% for abs_beam in abs_beams %}
               $("#bt_beam{{ forloop.counter }}").click(function() {
-                document.location = "{% url 'url_plot_abs_patterns' abs_beam.abs_conf.id abs_beam.id %}";
+                document.location = "{% url 'url_plot_abs_patterns2' abs_beam.abs_conf.id abs_beam.id %}";
               });
             {% endfor %}
             //function ChangeColor() {

apps/abs/templates/abs_uppattern_img.html +1 -7

@@ -2,10 +2,4
2	{% load django_bootstrap5 %}	2	{% load django_bootstrap5 %}
3	{% load main_tags %}	3	{% load main_tags %}
4		4
5	{% block content %}	5	<img id="imgMainUp" src="{% url 'url_plot_beam' beam.abs_conf.id beam.id 'up' %}" alt="Error ploting..." style="width: 250px;height:250px; background-image: url({% static 'images/loader.gif' %});background-repeat: no-repeat;background-position: 50% 50%;">
6
7	<div id="PictureOverJROUp" style="float: right">
8	<img id="imgMain" src="{% url 'url_plot_beam' beam.abs_conf.id beam.id 'up' %}" alt="Error ploting..." style="width:340px;height:340px; background-image: url({% static 'images/loader.gif' %});background-repeat: no-repeat;background-position: 50% 50%;">
9	</div>
10
11	{% endblock %}

apps/abs/urls.py +2 -2

                 #url(r'^(?P<id_conf>-?\d+)/status/', views.abs_conf, {'status_request':True},name='url_status_abs_conf'),
                 path('<int:id_conf>/change_beam/<int:id_beam>/', views.send_beam, name='url_send_beam'),
                 path('<int:id_conf>/plot/', views.plot_patterns, name='url_plot_abs_patterns'),
-                path('<int:id_conf>/plot/<int:id_beam>/', views.plot_patterns, name='url_plot_abs_patterns'),
+                path('<int:id_conf>/plot/<int:id_beam>/', views.plot_patterns, name='url_plot_abs_patterns2'),
-                path('<int:id_conf>/plot/<int:id_beam>/<int:antenna>/pattern.png', views.plot_pattern, name='url_plot_beam'),
+                path('<int:id_conf>/plot/<int:id_beam>/<slug:antenna>/pattern.png/', views.plot_pattern, name='url_plot_beam'),
                 path('<int:id_conf>/add_beam/', views.add_beam, name='url_add_abs_beam'),
                 path('<int:id_conf>/beam/<int:id_beam>/delete/', views.remove_beam, name='url_remove_abs_beam'),
                 path('<int:id_conf>/beam/<int:id_beam>/edit/', views.edit_beam, name='url_edit_abs_beam'),

apps/abs/utils/Graphics_OverJro.py +12 -12

                     levels = numpy.array([1e-3,1e-2,1e-1,0.5,1.0])
                     tmp = numpy.round(10*numpy.log10(levels),decimals=1)
                     labels = []
-                    for i in numpy.arange(5):labels.append(str(numpy.int(tmp[i])))
+                    for i in numpy.arange(5):labels.append(str(int(tmp[i])))
                     colors = ((0,0,1.),(0,170/255.,0),(127/255.,1.,0),(1.,109/255.,0),(128/255.,0,0))
                     # Getting HA and DEC axes
                     mindec = -28; maxdec = 4; incdec = 2.
-                    ndec = numpy.int((maxdec - mindec)/incdec) + 1
+                    ndec = int((maxdec - mindec)/incdec) + 1
                     minha = -20; maxha = 20; incha = 2.
-                    nha = numpy.int((maxha - minha)/incha) + 1
+                    nha = int((maxha - minha)/incha) + 1
                     #mcosx = numpy.zeros((nha,ndec))
                     #mcosy = numpy.zeros((nha,ndec))
                     if noval[0].size>0:mcosy[noval] = numpy.nan
                     # Plotting HA and declination grid.
-                    iha0 = numpy.int((0 - minha)/incha)
+                    iha0 = int((0 - minha)/incha)
-                    idec0 = numpy.int((-14 - mindec)/incdec)
+                    idec0 = int((-14 - mindec)/incdec)
                     colorgrid = (1.,109/255.,0)
                     self.ax.plot(mcosx.transpose(),mcosy.transpose(),color=colorgrid,linestyle='--')
                             valx = (mcosx[idec,iha0]<=xmax) & (mcosx[idec,iha0]>=xmin)
                             valy = (mcosy[idec,iha0]<=ymax) & (mcosy[idec,iha0]>=ymin)
                             if valx & valy:
-                                text = str(numpy.int(mindec + incdec*idec))+'$^o$'
+                                text = str(int(mindec + incdec*idec))+'$^o$'
                                 self.ax.text(mcosx[idec,iha0],mcosy[idec,iha0],text)
                     matplotlib.pyplot.plot(mcosx,mcosy,color=colorgrid,linestyle='--')
                             valx = (mcosx[idec0,iha]<=xmax) & (mcosx[idec0,iha]>=xmin)
                             valy = (mcosy[idec0,iha]<=ymax) & (mcosy[idec0,iha]>=ymin)
                             if valx & valy:
-                                text = str(4*numpy.int(minha + incha*iha))+"'"
+                                text = str(4*int(minha + incha*iha))+"'"
                                 self.ax.text(mcosx[idec0,iha],mcosy[idec0,iha],text)
                     if save:
                         ObjFig, = self.ax.plot(alpha_location[:,0,ih],alpha_location[:,1,ih],
-                            marker[ih % 8],color=colors[numpy.int(ih/8)],ms=4.5,lw=0.5)
+                            marker[ih % 8],color=colors[int(ih/8)],ms=4.5,lw=0.5)
                         handles.append(ObjFig)
-                        objects.append(numpy.str(heights[ih]) + ' km')
+                        objects.append(str(heights[ih]) + ' km')
                     self.ax.legend(handles,objects,loc="lower right", numpoints=1, handlelength=0.3,
                                    handletextpad=0.02, borderpad=0.3, labelspacing=0.1)
                         ObjFig, = matplotlib.pyplot.plot(alpha_location[:,0,ih],alpha_location[:,1,ih], \
-                            marker[ih % 8],color=colors[numpy.int(ih/8)],ms=4.5,lw=0.5)
+                            marker[ih % 8],color=colors[int(ih/8)],ms=4.5,lw=0.5)
                         handles.append(ObjFig)
-                        objects.append(numpy.str(heights[ih]) + ' km')
+                        objects.append(str(heights[ih]) + ' km')
                     matplotlib.pyplot.xlim(dcosxrange[0],dcosxrange[1])
                     matplotlib.pyplot.ylim(dcosyrange[0],dcosyrange[1])
                                 index = numpy.mean(tod_0[val]) - minlev
                                 index = (index*(maxcol - mincol)/(maxlev - minlev)) + mincol
-                                index = numpy.int(index)
+                                index = int(index)
                                 figobjects, = matplotlib.pyplot.plot(dcosx[val],dcosy[val],marker[io-1],\
                                   lw=1,ms=7,mew=0,color=tuple(colortable[:,index]))
                                 handles.append(figobjects)

apps/abs/utils/overJroShow.py +13 -10

                     --------------------
                     Developed by Jorge L. Chau.
                     Converted to Python by Freddy R. Galindo, ROJ, 20 September 2009.
+                    Updated to Django 4.1.5 and Python 3.9.16 by Renato Huallpa M. March 2023.
                     """
                     if rx==1:
                     fft_phase = fft_phase*CoFactors.d2r
-                    pattern = numpy.abs(numpy.fft.fft2(fft_gain*numpy.exp(numpy.complex(0,1)*fft_phase)))**2
+                    pattern = numpy.abs(numpy.fft.fft2(fft_gain*numpy.exp(complex(0,1)*fft_phase)))**2
                     pattern = numpy.fft.fftshift(pattern)
                     xvals = numpy.where((dcosx>=(numpy.min(self.dcosx))) & (dcosx<=(numpy.max(self.dcosx))))
                     --------------------
                     Developed by Jorge L. Chau.
                     Converted to Python by Freddy R. Galindo, ROJ, 20 September 2009.
+                    Updated to Django 4.1.5 and Python 3.9.16 by Renato Huallpa M. March 2023.
                     """
                     pos  = self.eomwl*self.__readAttenuation()
                             yindex = iy*(self.getcut==0) + ix*(self.getcut==1)
                             phasex = posx*self.dcosx[ix]
                             phasey = posy*self.dcosy[yindex]
-                            tmp = gain*numpy.exp(numpy.complex(0,1.)*(self.kk*(phasex+phasey)+phase))
+                            tmp = gain*numpy.exp(complex(0,1.)*(self.kk*(phasex+phasey)+phase))
                             module[ix,iy] = tmp.sum()
                     return module
                     yy1 = self.dcosy[numpy.min(nny):numpy.max(nny)+1]
                     # fitting data into the main beam.
-                    import gaussfit
+                    #import apps.abs.utils.gaussfit as gaussfit
-                    params = gaussfit.fitgaussian(mm1)
+                    from .gaussfit import fitgaussian
+                    params = fitgaussian(mm1)
                     # Tranforming from indexes to axis' values
                     xcenter = xx1[0] + (((xx1[xx1.size-1] - xx1[0])/(xx1.size -1))*(params[1]))
                     nfields = 1
                     grid_res = 0.5
-                    nlon = int(numpy.int(maglimits[2] - maglimits[0])/grid_res + 1)
+                    nlon = int(int(maglimits[2] - maglimits[0])/grid_res + 1)
-                    nlat = int(numpy.int(maglimits[3] - maglimits[1])/grid_res + 1)
+                    nlat = int(int(maglimits[3] - maglimits[1])/grid_res + 1)
                     location = numpy.zeros((nlon,nlat,2))
                     mlon = numpy.atleast_2d(numpy.arange(nlon)*grid_res + maglimits[0])
                     rr = numpy.zeros((heights.size,3))
                     rgc = numpy.zeros((heights.size,3))
-                    ObjGeodetic = Astro_Coords.Geodetic(gdlat,gdalt)
+                    ObjGeodetic = Geodetic(gdlat,gdalt)
                     [gclat,gcalt] = ObjGeodetic.change2geocentric()
                     gclat = gclat*numpy.pi/180.
                         vect_polar = Misc_Routines.Vector(numpy.array(vect_geo),direction=1).Polar2Rect()
-                        [ra,dec,ha] = Astro_Coords.AltAz(vect_polar[1],vect_polar[0],self.junkjd).change2equatorial()
+                        [ra,dec,ha] = AltAz(vect_polar[1],vect_polar[0],self.junkjd).change2equatorial()
                         print('Main beam position (HA(min), DEC(degrees)): %f %f')%(ha*4.,dec)
                             vect_polar = Misc_Routines.Vector(vect_geo,direction=1).Polar2Rect()
-                            [ra,dec,ha] = Astro_Coords.AltAz(vect_polar[1,:],vect_polar[0,:],self.junkjd).change2equatorial()
+                            [ra,dec,ha] = AltAz(vect_polar[1,:],vect_polar[0,:],self.junkjd).change2equatorial()
                             val = numpy.where(ha>=180)
                     julian = Time(year,month,dom).change2julday()
-                    [powr,time, lst] = Astro_Coords.CelestialBodies().skyNoise(julian)
+                    [powr,time, lst] = CelestialBodies().skyNoise(julian)
                     SkyNoisePlot([year,month,dom],powr,time,lst).getPlot(self.path4plotname,self.plotname2)

apps/jars/models.py +10 -3

                         self.device.status = payload['status']
                         self.device.save()
                         self.message = payload['message']
+                        print("------STOP JARS------",flush=True)
                     except Exception as e:
                         self.device.status = 0
                         self.message = str(e)
                         self.device.save()
                         return False
                     return True
                 def read_device(self):
                     if self.device.status == 3:
                         self.message = 'Could not configure device. Software Acquisition is running'
                         return False
+                    print("------ JARS WRITING ------",flush=True)
+                    self.device.status = 5  #Busy
+                    print("STATUS:", self.device.status,flush=True)
                     data = self.experiment.parms_to_dict()
                     #print(data)
                         return False
                     json_data = json.dumps(data)
+                    print("STATUS:", self.device.status,flush=True)
                     try:
                         payload = self.request('write', 'post', json=json_data)
                         self.device.save()
                         if self.device.status == 1:
                             return False
+                        print("------ JARS WRITED ------",flush=True)
                     except Exception as e:
                         self.device.status = 0
                         self.message = str(e)
                         self.device.save()
                         return False
+                    print("FINAL STATUS:", self.device.status,flush=True)
                     return True
                 def start_device(self):
                         self.message = str(e)
                         self.device.save()
                         return False
+                    print("------START JARS------",flush=True)
                     return True
                 def get_log(self):

apps/main/management/commands/hello.py +3 -4

                                 # print("RADR", rad)
                                 radar_id=rad["id"]
                                 # print("RADR_",radar_id)
-                                radar_start_scheduler(campaign.id,radar_id)
+                                radar_write_start_scheduler(campaign.id,radar_id)
                             print(campaign.name, "\t\t Campaign already running")
                         else:
                             else:
                                 print(campaign.name,"\t\t\t Campaign already stooped")
-            def radar_start_scheduler(id_camp,id_radar):
+            def radar_write_start_scheduler(id_camp,id_radar):
                 campaign    = get_object_or_404(Campaign, pk=id_camp)
                 experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
-                now         = datetime.now()
                 # print(campaign)
                 # print(experiments)
                 for exp in experiments:
                         if exp.status == 2:
                             print('\t\t\t {} \t\tExperiment started'.format(exp))
                         if exp.status == 4:
-                            print('\t\t\t {} \t\tExperiment with state uknown, please reset'.format(exp))
+                            print('\t\t\t {} \t\tExperiment with state uknown, please reset (Stop and start manually)'.format(exp))
                         exp.save()
             def radar_stop_scheduler(id_camp,id_radar,id_experiment):

apps/main/models.py +4 0

                              (2, 'Configured'),
                              (3, 'Running'),
                              (4, 'Unknown'),
+                             (5, 'Busy')
                          )
             DEV_TYPES = (
                 def stop_device(self):
                     self.message = 'Function not implemented'
+                    print("BUENAS SEÑALES??? NO LO CREO2",flush=True)
                     return False
                 def start_device(self):
                     self.message = 'Function not implemented'
+                    print("BUENAS SEÑALES??? NO LO CREO",flush=True)
                     return False
                 def write_device(self, parms):
                     self.message = 'Function not implemented'
+                    print("BUENAS SEÑALES??? NO LO CREO3",flush=True)
                     return False
                 def write_device_mqtt(self, parms):

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages