Fixing Astrometry typo

34ff7ada · Marco Frailis · 1f65921b · 34ff7ada · 34ff7ada · 34ff7ada
Commit 34ff7ada authored 6 years ago by Marco Frailis
--- a/db.sqlite3
+++ b/db.sqlite3
--- a/imagedb/models.py
+++ b/imagedb/models.py
@@ -149,7 +149,7 @@ class CtypeWcs(CompositeField):


 class Astrometry(models.Model):
-  ctpye1 = CtypeWcs()
+  ctype1 = CtypeWcs()
  ctype2 = CtypeWcs()
  crval1 = models.FloatField()
  crval2 = models.FloatField()

--- a/imagedb_objects.ipynb
+++ b/imagedb_objects.ipynb
@@ -4,7 +4,7 @@
   "cell_type": "markdown",
   "metadata": {},
   "source": [
-    "## Data insertion and retrieval with Django models\n",
+    "# Data insertion and retrieval with Django models\n",
    "\n",
    "In the following we show some examples in order to perform insertions and retrievals of metadata "
   ]
@@ -30,9 +30,20 @@
    "print(instrument.telescopeName)\n"
   ]
  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Creating new objects\n",
+    "\n",
+    "In the following we will create a NispRawFrame object. Since the NispRawFrame must have also a DataCotainer (i.e. a file to reference to), we first create a DataContainer instance.\n",
+    "\n",
+    "We can see also that the fields that we have defined as composite fields provide some synctactic sugar when we initialize them with simple dictionaries."
+   ]
+  },
  {
   "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 3,
   "metadata": {},
   "outputs": [],
   "source": [
@@ -44,7 +55,7 @@
    "  fileFormat = 'fits',\n",
    "  formatIdentifier = 'le1.nisprawframe',\n",
    "  formatVersion = '1.0',\n",
-    "  url = \"http://ia2-ownclud.oats.inaf.it/fake/7ff2f203/data/EUC_LE1_NISP_53892-Y-1_20170712T155430.1Z_00.00.fits\"\n",
+    "  url = \"http://ia2-owncloud.oats.inaf.it/fake/7ff2f203/data/EUC_LE1_NISP_53892-Y-1_20170712T155430.1Z_00.00.fits\"\n",
    ")\n",
    "\n",
    "# We have to save the data container to the DB before assigning it to a NispRawFrame\n",
@@ -74,9 +85,16 @@
    "image.frameFile = dataFile"
   ]
  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Before saving an object, its surrogate key is still empty, i.e. equal to None"
+   ]
+  },
  {
   "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 4,
   "metadata": {},
   "outputs": [
    {
@@ -84,7 +102,7 @@
     "output_type": "stream",
     "text": [
      "None\n",
-      "3\n"
+      "2\n"
     ]
    }
   ],
@@ -96,7 +114,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": 5,
   "metadata": {
    "scrolled": true
   },
@@ -107,7 +125,7 @@
       "<NispDetector: NispDetector object (4)>"
      ]
     },
-     "execution_count": 30,
+     "execution_count": 5,
     "metadata": {},
     "output_type": "execute_result"
    }
@@ -118,11 +136,14 @@
    "d11 = NispDetector(detectorId = \"11\", gain = 1.0, readoutNoise = 0.0, rawFrame = image)\n",
    "d11.save()\n",
    "\n",
-    "# or we can create the detector starting from the NispRawFrame, using the reversed relationship.\n",
-    "# No need to save the detector in this case. It is done automatically\n",
+    "# Or we can use the create() in order to create and save immediately the new object\n",
+    "NispDetector.objects.create(detectorId = \"12\", gain = 1.0, readoutNoise = 0.0, rawFrame = image)\n",
+    "\n",
+    "# or we can create the detector starting from the NispRawFrame, using the reversed relationship,\n",
+    "# using again the create method\n",
    "\n",
    "image.detectors.create(\n",
-    "  detectorId = \"12\",\n",
+    "  detectorId = \"13\",\n",
    "  gain = 1.0,\n",
    "  readoutNoise = 0.0\n",
    ")"
@@ -130,16 +151,16 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": 6,
   "metadata": {},
   "outputs": [
    {
     "data": {
      "text/plain": [
-       "<QuerySet [<NispDetector: NispDetector object (1)>, <NispDetector: NispDetector object (2)>]>"
+       "<QuerySet [<NispDetector: NispDetector object (2)>, <NispDetector: NispDetector object (3)>, <NispDetector: NispDetector object (4)>]>"
      ]
     },
-     "execution_count": 29,
+     "execution_count": 6,
     "metadata": {},
     "output_type": "execute_result"
    }
@@ -147,33 +168,6 @@
   "source": [
    "image.detectors.all()"
   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 27,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "<QuerySet [<NispDetector: NispDetector object (1)>]>"
-      ]
-     },
-     "execution_count": 27,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "image.detectors.all()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
  }
 ],
 "metadata": {

 %% Cell type:markdown id: tags:

-## Data insertion and retrieval with Django models
+# Data insertion and retrieval with Django models

 In the following we show some examples in order to perform insertions and retrievals of metadata

 %% Cell type:code id: tags:

 ``` python
 from imagedb.models import Instrument

 instrument = Instrument.objects.get(instrumentName='NISP')

 print(instrument.telescopeName)
 ```

 %% Output

    Euclid

+%% Cell type:markdown id: tags:
+
+## Creating new objects
+
+In the following we will create a NispRawFrame object. Since the NispRawFrame must have also a DataCotainer (i.e. a file to reference to), we first create a DataContainer instance.
+
+We can see also that the fields that we have defined as composite fields provide some synctactic sugar when we initialize them with simple dictionaries.
+
 %% Cell type:code id: tags:

 ``` python
 from imagedb.models import ImageType, Pointing, NispDetector, DataContainer, NispRawFrame

 from datetime import datetime

 dataFile = DataContainer(
  fileFormat = 'fits',
  formatIdentifier = 'le1.nisprawframe',
  formatVersion = '1.0',
-  url = "http://ia2-ownclud.oats.inaf.it/fake/7ff2f203/data/EUC_LE1_NISP_53892-Y-1_20170712T155430.1Z_00.00.fits"
+  url = "http://ia2-owncloud.oats.inaf.it/fake/7ff2f203/data/EUC_LE1_NISP_53892-Y-1_20170712T155430.1Z_00.00.fits"
 )

 # We have to save the data container to the DB before assigning it to a NispRawFrame
 dataFile.save()

 image = NispRawFrame(exposureTime = 105,
                     imgNumber = 16,
                     naxis1 = 2040,
                     naxis2 = 2040,
                     imageType = {'category':'SCIENCE',
                                  'firstType':'OBJECT',
                                  'secondType':'STD'},
                     observationDateTime = datetime.strptime("2025-06-21T18:27:23.000001",
                                                             "%Y-%m-%dT%H:%M:%S.%f"),
                     observationId = 53892,
                     ditherNumber = 1,
                     instrument = instrument,
                     commandedPointing = {'rightAscension':8.48223045516,
                                          'declination':8.48223045516,
                                          'orientation':64.8793517547},
                     filterWheelPosition = "Y",
                     grismWheelPosition = "OPEN"
                    )



 image.frameFile = dataFile
 ```

+%% Cell type:markdown id: tags:
+
+Before saving an object, its surrogate key is still empty, i.e. equal to None
+
 %% Cell type:code id: tags:

 ``` python
 print(image.id)
 image.save()
 print(image.id)
 ```

 %% Output

    None
-    3
+    2

 %% Cell type:code id: tags:

 ``` python
 # We can start creating a detector

 d11 = NispDetector(detectorId = "11", gain = 1.0, readoutNoise = 0.0, rawFrame = image)
 d11.save()

-# or we can create the detector starting from the NispRawFrame, using the reversed relationship.
-# No need to save the detector in this case. It is done automatically
+# Or we can use the create() in order to create and save immediately the new object
+NispDetector.objects.create(detectorId = "12", gain = 1.0, readoutNoise = 0.0, rawFrame = image)
+
+# or we can create the detector starting from the NispRawFrame, using the reversed relationship,
+# using again the create method

 image.detectors.create(
-  detectorId = "12",
+  detectorId = "13",
  gain = 1.0,
  readoutNoise = 0.0
 )
 ```

 %% Output

    <NispDetector: NispDetector object (4)>

 %% Cell type:code id: tags:

 ``` python
 image.detectors.all()
 ```

 %% Output

-    <QuerySet [<NispDetector: NispDetector object (1)>, <NispDetector: NispDetector object (2)>]>
-
-%% Cell type:code id: tags:
-
-``` python
-image.detectors.all()
-```
-
-%% Output
-
-    <QuerySet [<NispDetector: NispDetector object (1)>]>
-
-%% Cell type:code id: tags:
-
-``` python
-```
+    <QuerySet [<NispDetector: NispDetector object (2)>, <NispDetector: NispDetector object (3)>, <NispDetector: NispDetector object (4)>]>