Merge branch 'develop'

CMSTrackerDPG · May 30, 2022 · a982b4b · a982b4b
2 parents bf03553 + 357c8e4
commit a982b4b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/cablingmap/templates/cablingmap/cablingmap.html b/cablingmap/templates/cablingmap/cablingmap.html
@@ -32,6 +32,15 @@ <h4 class="text-center font-weight-bold mt-1 mb-1">Strip Detector</h4>
                     </div>
                 </div>
             </div>
+			<div class="card col-sm col-md bg-dark text-light" onclick="location.href='{% url 'remotescripts:list' %}'">
+                <div class="card-header">
+                    <h4 class="text-center font-weight-bold mt-1 mb-1">Remote tools</h4>
+                </div>
+                <img class="card-img-top" src="{% static 'home/img/trackermaps.png' %}" alt="Card image cap">
+                <div class="card-body">
+                    <p class="card-text text-center" style="font-size: 18px">Tools running on remote machines</p>
+                </div>
+			</div>	
         </div>
     </div>
 </div>

diff --git a/dqmhelper/settings.py b/dqmhelper/settings.py
@@ -19,7 +19,7 @@
     messages.ERROR: "danger",
 }
 # Version to display in order to keep track of changes
-CERTHELPER_VERSION = "1.5.0"
+CERTHELPER_VERSION = "1.5.1"
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

diff --git a/home/templates/home/home.html b/home/templates/home/home.html
@@ -103,15 +103,16 @@ <h4 class="text-center font-weight-bold mt-1 mb-1">Cabling Map & DCS Trend</h4>
 					</p>
                 </div>
             </div>
-			<div class="card col-sm col-md bg-dark text-light" onclick="location.href='{% url 'remotescripts:list' %}'">
+			<div class="card col-sm col-md bg-dark text-light" onclick="location.href='{% url 'remotescripts:trackermaps' %}'">
                 <div class="card-header">
-                    <h4 class="text-center font-weight-bold mt-1 mb-1">Remote tools</h4>
+                    <h4 class="text-center font-weight-bold mt-1 mb-1">Tracker Maps</h4>
                 </div>
                 <img class="card-img-top" src="{% static 'home/img/trackermaps.png' %}" alt="Card image cap">
                 <div class="card-body">
-                    <p class="card-text text-center" style="font-size: 18px">Tools running on remote machines</p>
+                    <p class="card-text text-center" style="font-size: 18px">Generate tracker maps</p>
                 </div>
 			</div>
+
             {% endif %}
 		</div>
 		{% else %}

diff --git a/remotescripts/models.py b/remotescripts/models.py
@@ -280,15 +280,15 @@ def execute(self, *args, **kwargs) -> int:
                         )
 
                 # Get output files from remote machine
-                for i, f in enumerate(output_files):
-                    localpath = os.path.join(tempfile.gettempdir(), f[1])
-                    remotepath = os.path.join(f[0].directory, f[1])
+                for f_db, f_remote in output_files:
+                    localpath = os.path.join(tempfile.gettempdir(), f_remote)
+                    remotepath = os.path.join(f_db.directory, f_remote)
                     logger.info(f"Copying remote file '{remotepath}' to '{localpath}'")
                     ftp.get(
                         remotepath=remotepath,
                         localpath=localpath,
                     )
-                    self.on_new_output_file(i, localpath)
+                    self.on_new_output_file(f_db.id, localpath)
                 ftp.close()
         ssh.close()
         return exit_status

diff --git a/remotescripts/templates/remotescripts/remote.html b/remotescripts/templates/remotescripts/remote.html
@@ -50,7 +50,7 @@ <h5>Script arguments</h5>
 			<h5>{{ output_file.filename_regex }}</h5>
 		</div>
 		<div class="card-body">
-			<img id="output-img-{{ output_file.id }}"></img>
+			<img class="img-fluid" id="output-img-{{ output_file.id }}"></img>
 		</div>
 	</div>
 	{% endfor %}
@@ -86,7 +86,7 @@ <h5>{{ output_file.filename_regex }}</h5>
 				 for(var key of Object.keys(data['message'])){
 					 if (key.startsWith('file'))
 					 {
-						 var file_id = Number(key.substring(key.indexOf('file') + 4)) + 1;
+						 var file_id = Number(key.substring(key.indexOf('file') + 4));
 						 img_div = document.getElementById(`output-img-${file_id}`);
 						 img_div.src = `data:image/png;base64,${data['message'][key]}`
 					 }

diff --git a/remotescripts/urls.py b/remotescripts/urls.py
@@ -5,4 +5,7 @@
 urlpatterns = [
     path("remote/list/", views.RemoteScriptListView.as_view(), name="list"),
     path("remote/<int:pk>/", views.RemoteScriptView.as_view(), name="detail"),
+    path(
+        "trackermaps_standalone/", views.TrackerMapsView.as_view(), name="trackermaps"
+    ),
 ]
diff --git a/remotescripts/views.py b/remotescripts/views.py
@@ -196,12 +196,12 @@ def run_tracker_maps(self, run_type: str, run_number_list: list) -> bool:
         Function that connects to vocms066 using the env-supplied username/password
         and executes the script to generate specific tracker maps.
         """
-        # tracker_maps_command = (
-        #     "cd /data/users/event_display/ShiftRun3/TkMapGeneration/CMS* &&"
-        #     " bash /data/users/event_display/ShiftRun3/TkMapGeneration/tkmapsFromCertHelper.sh"
-        #     f" {str(run_type)} {''.join(str(run_number)+' ' for run_number in run_number_list)}"
-        # )
-        tracker_maps_command = TEST_BASH_SCRIPT
+        tracker_maps_command = (
+            "cd /data/users/event_display/ShiftRun3/TkMapGeneration/CMS* &&"
+            " bash /data/users/event_display/ShiftRun3/TkMapGeneration/tkmapsFromCertHelper.sh"
+            f" {str(run_type)} {''.join(str(run_number)+' ' for run_number in run_number_list)}"
+        )
+        # tracker_maps_command = TEST_BASH_SCRIPT
 
         channel_layer = get_channel_layer()