* Added TOPAS JEC benchmarks

NaviXMon.py

@@ -41,7 +41,8 @@ def __init__():
     # workflow = 'higgs60sg'
     # workflow = 'copy60topas'
     # workflow = 'copy_tsy_v1'
-    workflow = 'copy_tsy_v2'
+    # workflow = 'copy_tsy_v2'
+    workflow = 'jec_topas'
 
     input_data = InputData(workflow)
     print('Loading file list:')

navimon/inputData.py

@@ -16,6 +16,8 @@ class InputData:
             self.copy_tsy_v1()
         elif workflow == 'copy_tsy_v2':
             self.copy_tsy_v2()
+        elif workflow == 'jec_topas':
+            self.jec_topas()
         else:
             print_with_color("WARNING: Input data for " + str(workflow) + " not found!\n Using default values!",
                              color='yellow')
@@ -87,3 +89,5 @@ class InputData:
         # self.navix_monitor_file_list = [r'data/copy/06-tsy/NaviX-4.mon.tsy.crashrun',
         #                                 r'data/copy/06-tsy/NaviX-5.mon.tsy']
 
+    def jec_topas(self):
+        self.navix_monitor_file_list = [r'data/jec/topas/NaviX_TOPAS_JEC_v1.mon']

navimon/predictionScenario.py

@@ -21,6 +21,8 @@ class Prediction:
             self.copy_tsy_v1()
         elif workflow == 'copy_tsy_v2':
             self.copy_tsy_v2()
+        elif workflow == 'jec_topas':
+            self.jec_topas()
         else:
             print_with_color("WARNING: Prediction model " + str(workflow) + " not found!\n Using default values!",
                              color='yellow')
@@ -73,3 +75,11 @@ class Prediction:
         self.cache_rate_per_node = 100.  # Cache speed in MB/s
         # self.cache_rate_per_node = 46.  # Cache speed in MB/s
         self.workflow_rate_max = 2000.  # Maximum speed the workflow allows per core
+
+    def jec_topas(self):
+        self.data_total = 1600 * 10 * 60  # about 500MB per file for Higgs skimming, 3.3GB per file for /dev/null tests
+        self.number_nodes = 3
+        self.number_slots_per_node = 20  # HTCondor slots
+        self.remote_rate_total = 5000 / 8  # 5Gb/s converted to MB/s
+        self.cache_rate_per_node = 1000  # Cache speed in MB/s
+        self.workflow_rate_max = 2000  # Maximum speed the workflow allows per core
\ No newline at end of file