radarsys Commit - r400:fea82e8575d1 · Jicamarca Repository

ver_3Julio :: new changes

jespinoza -

r400:fea82e8575d1

parent child

Context file:

r400:fea82e8575d1

Collapse all files

apps/abs/models.py +1 -1

                     # Create the datagram socket
                     sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
                     sock.settimeout(1)
-                    local_ip = os.environ.get('LOCAL_IP', '192.168.2.128')
+                    local_ip = os.environ.get('LOCAL_IP', '192.168.1.128')
                     sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, socket.inet_aton(local_ip))
                     sock.sendto(message.encode(), multicast_group)
                     print('Sending ' + message)

apps/abs/urls.py +1 -1

                 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>/<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/overJroShow.py +6 -6

                     yy1 = self.dcosy[numpy.min(nny):numpy.max(nny)+1]
                     # fitting data into the main beam.
-                    import gaussfit
+                    from .gaussfit import fitgaussian
-                    params = gaussfit.fitgaussian(mm1)
+                    params = fitgaussian(mm1)
                     # Tranforming from indexes to axis' values
                     xcenter = xx1[0] + (((xx1[xx1.size-1] - xx1[0])/(xx1.size -1))*(params[1]))
                     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/rc/models.py +11 -6

             import ast
             import json
             import requests
             import numpy as np
+            import time
             from base64 import b64encode
             from struct import pack
                     print("write device")
                     if not raw:
+                        pass
+                        '''
                         clock = RCClock.objects.get(rc_configuration=self)
                         if clock.mode:
                             data = {'default': clock.frequency}
                             self.message = payload['setfreq']
                             if payload['setfreq'] == 'fail':
                                 self.message = 'RC write: error programming CGS chip'
+                        '''
                     values = []
+                    print('ok')
                     for pulse, delay in zip(self.get_pulses(), self.get_delays()):
                         while delay > 65536:
                             values.append((pulse, 65535))
                     #payload = self.request('write', 'post', data=b64encode(bytearray((139, 62))), timeout=20)
                     n = len(data)
                     x = 0
-                    #while x < n:
+                    while x < n:
-                    payload = self.request('write', 'post', data=b64encode(data))
+                        payload = self.request('write', 'post', data=b64encode(data[x:x+1024]))
-                    #    x += 1024
+                        x += 1024
+                        time.sleep(1)
+                        print('writing... ', x)
                     if payload['write']=='ok':
                         self.device.status = 3
                 multiplier = models.PositiveIntegerField(default=60)
                 divisor = models.PositiveIntegerField(default=10)
                 reference = models.PositiveSmallIntegerField(default=1, choices=((0, 'Internal (25MHz)'), (1, 'External (10MHz)')))
-                frequency = models.FloatField(default=60.0)
  No newline at end of file
+                frequency = models.FloatField(default=60.0)

apps/rc/views.py +2 -3

             import json
             from django.contrib import messages
                         form.save()
                         #update lines fields
-                        extras.sort()
+                        extras.sort(key=lambda x: int(x.split('|')[0]))
                         #print("Inicio extras")
                         #print(extras)
                         #print("Fin extras")
             def conf_raw(request, conf_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 raw = conf.write_device(raw=True)
-                return HttpResponse(raw, content_type='application/json')
  No newline at end of file
+                return HttpResponse(raw, content_type='application/json')

docker-compose.yml +43 -41

@@ -1,42 +1,44
1	version: '2'	1	version: '2'
2	services:	2	services:
3	# Django app	3	# Django app
4	web:	4	# web:
5	~~container_name~~: 'radarsys'	5	# container_name: 'radarsys'
6	~~build~~: .	6	# build: .
7	~~restart~~: always	7	# restart: always
8	~~image~~: radarsys	8	# image: radarsys
9	~~command~~: gunicorn radarsys.wsgi:application -w 2 -b :8000	9	# command: gunicorn radarsys.wsgi:application -w 2 -b :8000
10	# command: python manage.py runserver 0.0.0.0:8030	10	# # command: python manage.py runserver 0.0.0.0:8030
11	# ports:	11	# # ports:
12	# - 8030:8030	12	# # - 8030:8030
13	~~env_file~~: .env	13	# env_file: .env
14		14
15	links:	15	# links:
16	- redis	16	# - redis
17	- postgres	17	# - postgres
18	volumes:	18	# volumes:
19	- './:/radarsys'	19	# - './:/radarsys'
20	- '${DOCKER_DATA}/static:/radarsys/static'	20	# - '${DOCKER_DATA}/static:/radarsys/static'
21	depends_on:	21	# depends_on:
22	- redis	22	# - redis
23	- postgres	23	# - postgres
24		24
25	redis:	25	redis:
26	container_name: 'radarsys-redis'	26	container_name: 'radarsys-redis'
27	image: 'redis:3.2-alpine'	27	image: 'redis:3.2-alpine'
28	volumes:	28	volumes:
29	- '${DOCKER_DATA}/redis:/data'	29	- '${DOCKER_DATA}/redis:/data'
		30	ports:
		31	- 6300:6379
30		32
31	celery_worker:	33	celery_worker:
32	container_name: 'radarsys-celery'	34	container_name: 'radarsys-celery'
33	image: radarsys	35	image: radarsys
34	env_file: .env	36	env_file: .env
35	command: celery -A radarsys worker -l info	37	command: celery -A radarsys worker -l info
36	volumes_from:	38	# volumes_from:
37	- web	39	# - web
38	depends_on:	40	# depends_on:
39	- web	41	# - web
40		42
41	# PostgreSQL	43	# PostgreSQL
42	postgres:	44	postgres:
@@ -44,25 +46,25 services:
44	build: ./postgres/	46	build: ./postgres/
45	volumes:	47	volumes:
46	- ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d	48	- ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
47	- ~~pgdata~~:/var/lib/postgresql/data	49	- /data/dockers/radarsys/postgres:/var/lib/postgresql/data
48	# ports:	50	ports:
49	# - 5432:5432	51	- 5400:5432
50	env_file: .env	52	env_file: .env
51		53
52	# Web Server	54	# Web Server
53	nginx:	55	# nginx:
54	container_name: 'radarsys-nginx'	56	# container_name: 'radarsys-nginx'
55	restart: always	57	# restart: always
56	build: ./nginx/	58	# build: ./nginx/
57	ports:	59	# ports:
58	- '8030:8030'	60	# - '8030:8030'
59	volumes_from:	61	# volumes_from:
60	- web	62	# - web
61	links:	63	# links:
62	- web:web	64	# - web:web
63	depends_on:	65	# depends_on:
64	- web	66	# - web
65		67
66	volumes:	68	# volumes:
67	pgdata:	69	# pgdata:
68	driver: local	70	# driver: local

radarsys/settings.py +21 -27

             # Application definition
-            INSTALLED_APPS = [
+            INSTALLED_APPS = (
                 'django.contrib.admin',
                 'django.contrib.auth',
                 'django.contrib.contenttypes',
                 'apps.misc',
                 'apps.rc',
                 'apps.dds',
+                'apps.dds_rest',
                 'apps.jars',
                 'apps.usrp',
                 'apps.abs',
                 'apps.cgs',
-                'apps.dds_rest',
             MIDDLEWARE = [
                 'django.middleware.security.SecurityMiddleware',
             TEMPLATES = [
                 {
                     'BACKEND': 'django.template.backends.django.DjangoTemplates',
-                    'DIRS': [os.path.join(BASE_DIR, "templates")],
+                    'DIRS': [os.path.join(BASE_DIR, "templates").replace('\\', '/'),],
                     'APP_DIRS': True,
                     'OPTIONS': {
                         'context_processors': [
                 'default': {
                     'ENGINE': 'django.db.backends.sqlite3',
                     'NAME': 'radarsys.sqlite',
+                    # 'ENGINE': 'django.db.backends.postgresql_psycopg2',
+                    # 'NAME': os.environ.get('DB_NAME', 'radarsys'),
+                    # 'USER': os.environ.get('DB_USER', 'docker'),
+                    # 'PASSWORD': os.environ.get('DB_PASSWORD', 'docker'),
+                    # 'HOST': os.environ.get('POSTGRES_PORT_5432_TCP_ADDR', 'localhost'),
+                    # 'PORT': os.environ.get('POSTGRES_PORT_5432_TCP_PORT', '5400'),
+                    }
                 }
-                # 'default': {
-                #     'ENGINE': 'django.db.backends.postgresql_psycopg2',
-                #     'NAME': os.environ.get('DB_NAME', 'radarsys'),
-                #     'USER': os.environ.get('DB_USER', 'docker'),
-                #     'PASSWORD': os.environ.get('DB_PASSWORD', 'docker'),
-                #     'HOST': os.environ.get('POSTGRES_PORT_5432_TCP_ADDR', 'localhost'),
-                #     'PORT': os.environ.get('POSTGRES_PORT_5432_TCP_PORT', '5400'),
-                #}
             # Internationalization
             # https://docs.djangoproject.com/en/1.8/topics/i18n/
             LANGUAGE_CODE = 'en-us'
-            USE_TZ   = False #True
             TIME_ZONE = os.environ.get('TZ', 'America/Lima')
             USE_I18N = True
             USE_L10N = True
+            USE_TZ = False
             # Static files (CSS, JavaScript, Images)
             # https://docs.djangoproject.com/en/1.8/howto/static-files/
             )
             # Celery stuff
+            REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1')
-            REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost')
+            REDIS_PORT = os.environ.get('REDIS_PORT', 6300)
-            #REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1')
-            REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
             BROKER_TRANSPORT = 'redis'
-            #BROKER_URL       = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
+            BROKER_URL = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
-            BROKER_URL       = 'redis://{}:{}'.format(REDIS_HOST, REDIS_PORT)
-            CELERY_RESULT_BACKEND    = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
+            CELERY_RESULT_BACKEND = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
-            CELERY_BROKER_TRANSPORT  = BROKER_URL
+            CELERY_BROKER_TRANSPORT = BROKER_URL
-            CELERY_ACCEPT_CONTENT    = ['application/json']
+            CELERY_ACCEPT_CONTENT = ['application/json']
-            CELERY_TASK_SERIALIZER   = 'json'
+            CELERY_TASK_SERIALIZER = 'json'
             CELERY_RESULT_SERIALIZER = 'json'
-            CELERY_ENABLE_UTC        = False
+            CELERY_ENABLE_UTC = False
-            CELERY_TIMEZONE          = 'America/Lima'
  No newline at end of file

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