diff --git a/data/download_data_grand.py b/data/download_data_grand.py index 3bb1e5f0..c2031bf8 100755 --- a/data/download_data_grand.py +++ b/data/download_data_grand.py @@ -20,7 +20,8 @@ #FILE_MODEL = "grand_model_2207.tar.gz" #LINK_MODEL = "https://forge.in2p3.fr/attachments/download/201909/grand_model_2306.tar.gz" #LINK_MODEL = "https://forge.in2p3.fr/attachments/download/251637/grand_model_190224.tar.gz" -LINK_MODEL = "https://forge.in2p3.fr/attachments/download/340302/grand_model_141124.tar.gz" +#LINK_MODEL = "https://forge.in2p3.fr/attachments/download/340302/grand_model_141124.tar.gz" +LINK_MODEL = "https://forge.in2p3.fr/attachments/download/362481/grand_model_20241218.tar.gz" FILE_MODEL = LINK_MODEL.split("/")[-1] diff --git a/data/download_grand_antenna_models.py b/data/download_grand_antenna_models.py index 59150f85..5190185a 100755 --- a/data/download_grand_antenna_models.py +++ b/data/download_grand_antenna_models.py @@ -20,7 +20,8 @@ #FILE_MODEL = "grand_model_2207.tar.gz" #LINK_MODEL = "https://forge.in2p3.fr/attachments/download/201909/grand_model_2306.tar.gz" #LINK_MODEL = "https://forge.in2p3.fr/attachments/download/251637/grand_model_190224.tar.gz" -LINK_MODEL = "https://forge.in2p3.fr/attachments/download/340302/grand_model_141124.tar.gz" +#LINK_MODEL = "https://forge.in2p3.fr/attachments/download/340302/grand_model_141124.tar.gz" +LINK_MODEL = "https://forge.in2p3.fr/attachments/download/362481/grand_model_20241218.tar.gz" FILE_MODEL = LINK_MODEL.split("/")[-1] diff --git a/data/download_new_RFchain_grand.py b/data/download_new_RFchain_grand.py index 80099a14..48438f79 100755 --- a/data/download_new_RFchain_grand.py +++ b/data/download_new_RFchain_grand.py @@ -1,9 +1,9 @@ #! /usr/bin/env python3 ''' -Created on 19 juil. 2022 +Created on 24 DEC. 2024 -@author: Jean-Marc Colley, CNRS/IN2P3/LPNHE +@author: SN ''' import tarfile @@ -20,7 +20,8 @@ #FILE_MODEL = "grand_model_2207.tar.gz" #LINK_MODEL = "https://forge.in2p3.fr/attachments/download/201909/grand_model_2306.tar.gz" #LINK_MODEL = "https://forge.in2p3.fr/attachments/download/251637/grand_model_190224.tar.gz" -LINK_MODEL = "https://forge.in2p3.fr/attachments/download/312643/RFchain_V3.tar.gz" +#LINK_MODEL = "https://forge.in2p3.fr/attachments/download/312643/RFchain_V3.tar.gz" +LINK_MODEL = "https://forge.in2p3.fr/attachments/download/362478/RF_chain_20241218.tar.gz" FILE_MODEL = LINK_MODEL.split("/")[-1] # class MyProgressBar(): # def __init__(self): diff --git a/examples/read_modify_RF_chain_elements.ipynb b/examples/read_modify_RF_chain_elements.ipynb index 9c1ad0b3..3e0d6253 100644 --- a/examples/read_modify_RF_chain_elements.ipynb +++ b/examples/read_modify_RF_chain_elements.ipynb @@ -382,7 +382,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 5, "id": "e9efdc03-0134-4c05-a6f3-3ec60ea02a3b", "metadata": {}, "outputs": [], @@ -401,7 +401,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 6, "id": "6426156e-196d-4d2b-93bb-bd0d44ad4d24", "metadata": {}, "outputs": [], @@ -422,7 +422,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 7, "id": "e64d22fb-f93d-4858-9d9c-06d2f30a9611", "metadata": {}, "outputs": [], @@ -464,7 +464,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 9, "id": "da9c238a-ddf5-46db-a280-6486ed1727bf", "metadata": {}, "outputs": [], @@ -475,7 +475,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 10, "id": "568de170-80af-486e-8806-786fb472ae2d", "metadata": {}, "outputs": [], @@ -505,7 +505,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 12, "id": "a9d4ac60-6158-4b7a-b44e-50335b898c4f", "metadata": {}, "outputs": [], @@ -517,7 +517,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 13, "id": "138e4006-fcf7-406f-ba04-8dd9d8f5b2be", "metadata": {}, "outputs": [ diff --git a/grand/sim/detector/rf_chain.py b/grand/sim/detector/rf_chain.py index 87de8558..9f9a1e08 100755 --- a/grand/sim/detector/rf_chain.py +++ b/grand/sim/detector/rf_chain.py @@ -183,7 +183,7 @@ def _set_name_data_file(self, axis): ! 2 Port Network Data from SP1.SP block """ axis_dict = {0:"X", 1:"Y", 2:"Z"} - filename = os.path.join("detector", "RFchain_v2", "NewMatchingNetwork"f"{axis_dict[axis]}.s2p") + filename = os.path.join("detector", "RFchain_v2", "MatchingNetwork"f"{axis_dict[axis]}.s2p") return grand_add_path_data(filename) @@ -421,7 +421,7 @@ def _set_name_data_file(self, axis): Hz S dB R 50.000 """ axis_dict = {0:"X", 1:"Y", 2:"Z"} - filename = os.path.join("detector", "RFchain_v2", "NewLNA_"f"{axis_dict[axis]}.s2p") + filename = os.path.join("detector", "RFchain_v2", "LNA-"f"{axis_dict[axis]}.s2p") return grand_add_path_data(filename) @@ -705,8 +705,9 @@ def _set_name_data_file(self, axis=0): """ assert self.gain in [-5, 0, 5, 20] logger.info(f"vga gain: {self.gain} dB") - filename = os.path.join("detector", "RFchain_v2", "filter+"f"vga{self.gain}db+filter.s2p") - + #filename = os.path.join("detector", "RFchain_v2", "filter+"f"vga{self.gain}db+filter.s2p") + filename = os.path.join("detector", "RFchain_v2", "feb+amfitler+biast.s2p") + return grand_add_path_data(filename) def compute_for_freqs(self, freqs_mhz): diff --git a/scripts/T1_trigger_offline.py b/scripts/T1_trigger_offline.py index 3f963c60..2350cd74 100644 --- a/scripts/T1_trigger_offline.py +++ b/scripts/T1_trigger_offline.py @@ -1,4 +1,4 @@ -#!/pbs/home/x/xtian/.conda/envs/grandlib2304/bin/python3.9 +#!/usr/bin/env python3 import numpy as np import sys import grand.dataio.root_trees as rt diff --git a/scripts/figures/Output_Voltage_VGA.png b/scripts/figures/Output_Voltage_VGA.png index e0e39a7f..1b515705 100644 Binary files a/scripts/figures/Output_Voltage_VGA.png and b/scripts/figures/Output_Voltage_VGA.png differ diff --git a/scripts/figures/total_transfer_function_vgagain20.png b/scripts/figures/total_transfer_function_vgagain20.png index b5357420..2757b064 100644 Binary files a/scripts/figures/total_transfer_function_vgagain20.png and b/scripts/figures/total_transfer_function_vgagain20.png differ diff --git a/scripts/tefield_0-0_L0_0000.root b/scripts/tefield_0-0_L0_0000.root deleted file mode 100644 index 2893b0f3..00000000 Binary files a/scripts/tefield_0-0_L0_0000.root and /dev/null differ