Home Explore
compton
/
sources
0
0
Fork 0
Files
Browse Source

Update for season 24/2

compton 4 months ago
parent
7022a95ee4
commit
36696dd108
4 changed files with 49 additions and 3 deletions
Unified View Show Diff Stats
  1. 1 1
      src/avg/compton_combiner.py
  2. 7 0
      src/page/.htaccess
  3. 39 0
      src/page/index.php
  4. 2 2
      src/scripts/compton_runs_script.sh

+ 1 - 1
src/avg/compton_combiner.py
View File 

@@ -23,7 +23,7 @@ SEASONS = {
 
     'name': ['PHIOMEGA2012', 'RHO2013', 'BRK2013/16', 'HIGH2017', 'RHO2018', 'HIGH2019', 'LOW2020', 'HIGH2020', 'HIGH2021', 'NNBAR2022', 'HIGH2023', 'PHI2024'],
 
     'name': ['PHIOMEGA2012', 'RHO2013', 'BRK2013/16', 'HIGH2017', 'RHO2018', 'HIGH2019', 'LOW2020', 'HIGH2020', 'HIGH2021', 'NNBAR2022', 'HIGH2023', 'PHI2024'],
 
     'start_run': [17405, 18809, 32076, 36872, 48938, 70014, 85224, 89973, 98116, 107342, 131913, 163012, None],
 
     'start_run': [17405, 18809, 32076, 36872, 48938, 70014, 85224, 89973, 98116, 107342, 131913, 163012, None],
 
 }
 
 }
 
-MANUAL_RUNS_SPLIT = [0, 150159, np.inf] # list[runs] to manually split point with the same energy
 
+MANUAL_RUNS_SPLIT = [0, 150159, 186326, np.inf] # list[runs] to manually split point with the same energy
 
 
 
 class RunsDBHandler():
 
 class RunsDBHandler():
 
     def __init__(self, host: str = 'cmddb', database: str = 'online', user: str = None, password: str = None):
 
     def __init__(self, host: str = 'cmddb', database: str = 'online', user: str = None, password: str = None):

+ 7 - 0
src/page/.htaccess
View File 

@@ -0,0 +1,7 @@
 
+IndexIgnore *
 
+RewriteEngine Off
 
+
 
+<FilesMatch ".(htaccess|htpasswd|ini|phps|fla|psd|log|sh)$">
 
+Order Allow,Deny
 
+Deny from all
 
+</FilesMatch>

+ 39 - 0
src/page/index.php
View File 

@@ -0,0 +1,39 @@
 
+<html>
 
+    <title>Compton pictures</title>
 
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
+    <link rel="stylesheet" href="main.css">
 
+    
+    <body>
 
+        <div class="main_block">
 
+            <h1>Compton avg by seasons</h1>
 
+
 
+	    <!--
 
+            <?php
 
+                $directory = '.';
 
+                $scanned_directory = array_diff(scandir($directory), array('..', '.'));
 
+                $indir = array_filter($scanned_directory, function($item) {
 
+                    return is_dir('./' . $item);
 
+                });
 
+                foreach($indir as $v){ ?>
 
+                    <a href="./plots.php?season=<?echo $v;?>"><?echo $v;?></a><br>
 
+                    <?
 
+                }
 
+	    ?> 
+
 
+            <br> -->
 
+	    
+            <a href="./init.php?season=RHO2013">RHO2013<a><br>
 
+	    <a href="./init.php?season=HIGH2017">HIGH2017<a><br>
 
+	    <a href="./init.php?season=RHO2018">RHO2018<a><br>
 
+            <a href="./init.php?season=HIGH2019">HIGH2019<a><br>
 
+	    <a href="./init.php?season=LOW2020">LOW2020<a><br>
 
+	    <a href="./init.php?season=HIGH2020">HIGH2020<a><br>
 
+	    <a href="./init.php?season=HIGH2021">HIGH2021<a><br>	    
+	    <a href="./init.php?season=NNBAR2022">NNBAR2022</a><br>
 
+	    <a href="./init.php?season=HIGH2023">HIGH2023</a><br>
 
+	    <a href="./init.php?season=PHI2024">PHI2024</a><br>
 
+		<br>
 
+            <a href="./summary.php?csv_file=PHI2024.csv">Season summary</a>
 
+        </div>
 
+    </body>
 
+</html>

+ 2 - 2
src/scripts/compton_runs_script.sh
View File 

@@ -9,11 +9,11 @@ SOURCE_BRANCH=master
 
 TABLES_BRANCH=online
 
 TABLES_BRANCH=online
 
 
 
 SEASON=PHI2024
 
 SEASON=PHI2024
 
-SLOWDB_TABLE=cmd3_2024_1
 
+SLOWDB_TABLE=cmd3_2024_2
 
 COMPTON_FILTER=$SOURCE_FOLDER/src/avg/compton_filter.py
 
 COMPTON_FILTER=$SOURCE_FOLDER/src/avg/compton_filter.py
 
 COMPTON_COMBINER=$SOURCE_FOLDER/src/avg/compton_combiner.py
 
 COMPTON_COMBINER=$SOURCE_FOLDER/src/avg/compton_combiner.py
 
 
 
-# Sync repositories
 
+Sync repositories
 
 git -C $SOURCE_FOLDER checkout $SOURCE_BRANCH
 
 git -C $SOURCE_FOLDER checkout $SOURCE_BRANCH
 
 git -C $SOURCE_FOLDER pull origin $SOURCE_BRANCH
 
 git -C $SOURCE_FOLDER pull origin $SOURCE_BRANCH