new file added

grand-mother · Feb 9, 2024 · bd7c2a1 · bd7c2a1
1 parent 8f01b17
commit bd7c2a1
Show file tree

Hide file tree

Showing 8 changed files with 694 additions and 137 deletions.
diff --git a/calculate_RFchain.ipynb b/calculate_RFchain.ipynb
@@ -2,10 +2,18 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 1,
    "id": "c2b7e006-93e3-46c0-96c9-a72c71ea84ad",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Welcome to JupyROOT 6.26/02\n"
+     ]
+    }
+   ],
    "source": [
     "import numpy as np\n",
     "import scipy.fft as sf\n",
@@ -17,7 +25,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 35,
+   "execution_count": 2,
    "id": "3a45f47a-a307-4aa8-a66d-a8cfe58c49cd",
    "metadata": {},
    "outputs": [],
@@ -28,7 +36,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 3,
    "id": "b975ecc5-615c-49ea-96b4-c123e2aa370b",
    "metadata": {},
    "outputs": [
@@ -38,7 +46,7 @@
        "array([   0.,    1.,    2., ...,  998.,  999., 1000.])"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -49,7 +57,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 59,
+   "execution_count": 4,
    "id": "004b1ca7-9f61-4fbe-a3fa-ded975a44def",
    "metadata": {},
    "outputs": [],
@@ -59,7 +67,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 60,
+   "execution_count": 5,
    "id": "37625d8c-0c0e-424b-ad4f-b7abad38e6dd",
    "metadata": {},
    "outputs": [
@@ -91,7 +99,7 @@
        "       296, 297, 298, 299, 300])"
       ]
      },
-     "execution_count": 60,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -102,7 +110,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 61,
+   "execution_count": 6,
    "id": "4c55e31a-5402-4468-8c17-77c375027167",
    "metadata": {},
    "outputs": [],
@@ -115,7 +123,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 62,
+   "execution_count": 7,
    "id": "eb7bb1b3-ff4c-453c-b43a-54e9f2673d7d",
    "metadata": {},
    "outputs": [
@@ -125,7 +133,7 @@
        "(3, 291)"
       ]
      },
-     "execution_count": 62,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -136,23 +144,44 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 57,
+   "execution_count": 9,
    "id": "16f542c4-d5f5-49dd-9096-0f4a03ac1da5",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "(0.0076615103-0.010799794j)"
+       "(-0.0069247605-0.028537517j)"
+      ]
+     },
+     "execution_count": 9,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "tf_3d[2,290]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 12,
+   "id": "2709ad49-f073-4cde-bab6-74f76a27de6e",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "291"
       ]
      },
-     "execution_count": 57,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "tf_3d[0,290]"
+    "len(tf_3d[1,:])"
    ]
   },
   {

diff --git a/examples/sim/antenna.ipynb b/examples/sim/antenna.ipynb
diff --git a/examples/sim/galactic_noise.ipynb b/examples/sim/galactic_noise.ipynb
@@ -35,7 +35,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 2,
    "id": "578071d3",
    "metadata": {},
    "outputs": [

diff --git a/examples/sim/rf_chain_example.ipynb b/examples/sim/rf_chain_example.ipynb
diff --git a/grand/sim/detector/antenna_model.py b/grand/sim/detector/antenna_model.py
@@ -109,6 +109,26 @@ def __init__(self, du_type="GP300"):
             path_ant = grand_add_path_data("detector/Light_GP300Antenna_Zarm_leff.npz")
             self.leff_z = tabulated_antenna_model(path_ant)
 
+        elif du_type=="GP300_nec":
+            logger.info(f"Loading GP300 antenna model ...")
+
+            path_ant = grand_add_path_data("detector/Light_GP300Antenna_Nec_EWarm_leff.npz")
+            self.leff_ew = tabulated_antenna_model(path_ant)
+            path_ant = grand_add_path_data("detector/Light_GP300Antenna_Nec_NSarm_leff.npz")
+            self.leff_sn = tabulated_antenna_model(path_ant)
+            path_ant = grand_add_path_data("detector/Light_GP300Antenna_Nec_Zarm_leff.npz")
+            self.leff_z = tabulated_antenna_model(path_ant)
+
+        elif du_type=="GP300_mat":
+            logger.info(f"Loading GP300 antenna model ...")
+
+            path_ant = grand_add_path_data("detector/Light_GP300Antenna_Mat_EWarm_leff.npz")
+            self.leff_ew = tabulated_antenna_model(path_ant)
+            path_ant = grand_add_path_data("detector/Light_GP300Antenna_Mat_NSarm_leff.npz")
+            self.leff_sn = tabulated_antenna_model(path_ant)
+            path_ant = grand_add_path_data("detector/Light_GP300Antenna_Mat_Zarm_leff.npz")
+            self.leff_z = tabulated_antenna_model(path_ant)
+
         elif du_type=='Horizon':
             path_ant = grand_add_path_data("detector/HorizonAntenna_EWarm_leff_loaded.npy")
             self.leff_ew = tabulated_antenna_model(path_ant)

diff --git a/grand/sim/noise/Test_for_new_galaxy_py.ipynb b/grand/sim/noise/Test_for_new_galaxy_py.ipynb