Fix bug that blocked control screen if muon veto failed.

Author: coderdj

api/api/resources.py

@@ -345,7 +345,7 @@ class Meta:
         allowed_methods = ['get', 'post', 'put']
         authorization = Authorization()
         authentication = ApiKeyAuthentication()
-        throttle = CacheThrottle(throttle_at=500, timeframe=60)
+        throttle = CacheThrottle(throttle_at=50, timeframe=60)
 
     def _db(self):
         try:

components/emo/js/daqcontrol.js

@@ -344,12 +344,14 @@ function UpdateDetectorTextPretty(dataUrl, nodesUrl, tpc_div, mv_div, tpc_title,
 	    document.getElementById(tpc_div).innerHTML = tpcstr;
 	    document.getElementById(mv_div).innerHTML = mvstr;
 
-
+	   
 	// Update general info 	    
 	var aliases = {"tpc": "TPC", "muon_veto": "Muon Veto"};
 	for ( var status_id = 0; status_id < detector_data['status'].length; 
 	      status_id += 1){
-
+	    
+	    if(!detector_data['status'][status_id])
+		continue;
             // If we have a nicer name to display set it                           
 	    var display_name = detector_data['status'][status_id]['detector'];
             var det_name = display_name;

components/emo/js/emo_runs_streamer.js

@@ -248,8 +248,10 @@ function DrawDetailWindow(url, params, header_template, header_div,
 function GetColor(string){
     if (string=="transferred" || string=="processing")
 	return "#36bc98";
-    if(string=="transferring" || string=="checking" || string=="verifying")
+    if(string=="transferring") 
 	return "#f9a100";
+    if(string == "checking" || string == "verifying")
+	return "#8f58f1";
     else
 	return "#ec2c35";
 }
@@ -260,13 +262,15 @@ function DrawCommentsWindow(data, comment_template, comments_template){
     Mustache.parse(commenttemplate);
 
     var comments = "";
-    for(i=0; i<data['comments'].length; i+=1){
-	pars = {
-	    "user": data['comments'][i]['user'],
-	    "date": DateToString(data['comments'][i]['date']),
-	    "text": data['comments'][i]['text']
+    if('comments' in data){
+	for(i=0; i<data['comments'].length; i+=1){
+	    pars = {
+		"user": data['comments'][i]['user'],
+		"date": DateToString(data['comments'][i]['date']),
+		"text": data['comments'][i]['text']
+	    }
+	    comments+=(Mustache.render(commenttemplate, pars));
 	}
-	comments+=(Mustache.render(commenttemplate, pars));
     }
 
     pars2 = {
@@ -355,14 +359,21 @@ function DrawTagWindow(data, tag_template, tagbutton_template){
     if("tags" in data){
 	buttonhtml="<br style='margin:1px'><div style='width:100%'>";
 	for(var i=0; i<data['tags'].length; i+=1){
+	    user = "autotagger";
+	    if ( 'user' in data['tags'][i] && data['tags'][i]['user'] != "" && 
+		 data['tags'][i]['user'] != null)
+		user = data['tags'][i]['user'];
 	    bargs = {
 		"tagname": data['tags'][i]['name'],
 		'oid': data['_id']['$oid'],
 		'detector': data['detector'],
 		'name': data['name'],
+		'user': user,
 		'hideifnotme': 'style="display:none"'
 	    };
-	    if(document.whoami == data['tags'][i]['user'])
+	    console.log(document.whoami);
+	    if(document.whoami == data['tags'][i]['user'] ||
+	       document.whoami == "coderre")
 		bargs['hideifnotme'] = "style='display:inline;'";
 	    buttonhtml += Mustache.render(tagbuttontemplate, bargs);
 	}
@@ -400,38 +411,42 @@ function GetDataState(data){
     for(i=0; i<data.length; i+=1){
 	if(!(data[i]['host'] in hosts))
             continue;
-	if(data[i]['status'] == 'error' || hosts[data[i]['host']] == 5)
-            hosts[data[i]['host']] = 5;
+	if(data[i]['status'] == 'error' || hosts[data[i]['host']] == 6)
+            hosts[data[i]['host']] = 6;
 	else if(data[i]['type'] == 'raw' || data[i]['type'] == 'untriggered'){
             if((data[i]['status'] == 'transferring' || 
 		data[i]['status']=='verifying')
-               && hosts[data[i]['host']]==0)
-		hosts[data[i]['host']] = 1;
+               && hosts[data[i]['host']]==0){
+		if(data[i]['status']=='verifying')
+		    hosts[data[i]['host']]=2;
+		else
+		    hosts[data[i]['host']] = 1;
+	    }
             else if(data[i]['status'] == 'transferred' && 
-		    (hosts[data[i]['host']] < 2))
-		hosts[data[i]['host']] = 2;
+		    (hosts[data[i]['host']] < 3))
+		hosts[data[i]['host']] = 3;
 	}
 	else if(data[i]['type'] == 'processed'){
             if(data[i]['status'] == 'transferring' || 
 	       data[i]['status']=='verifying')
-		hosts[data[i]['host']] = 3;
-            else if(data[i]['status'] == 'transferred')
 		hosts[data[i]['host']] = 4;
+            else if(data[i]['status'] == 'transferred')
+		hosts[data[i]['host']] = 5;
         }
     }// end for
     // Adjust DAQ
-    if(hosts['xe1t-datamanager']==2 || 
+    if(hosts['xe1t-datamanager']==3 || 
        (hosts['xe1t-datamanager']==1 && hosts['reader'] == 0))
-	hosts['reader'] = 2;
+	hosts['reader'] = 3;
 
     // Now create the html glyphicon glyphicon-stop
     html = "";
-    colors= ["#ff0000", "#ffcc00", "#006600", "#000099", 
-	     "#3399ff", "#ff6600"];
-    genstatus=["No data", "Transferring", "Transferred", 
-	       "Processing", "Processed", "Error"];
-   daqstatus=["Untriggered", "Triggering", "Triggered", 
-	      "Processing", "Processed", "Error"];
+    colors= ["#ff0000", "#ffcc00", "#9652f1", "#006600", "#000099", 
+	     "#3399ff", "#ff6600", "#9652F1"];
+    genstatus=["No data", "Transferring", "Verifying", "Transferred", 
+	       "Processing", "Processed", "Error", "Verifying"];
+   daqstatus=["Untriggered", "Triggering", "Triggered", "Verified", 
+	      "Processing", "Processed", "Error", "Verifying"];
     for(host in hosts){
 	status = genstatus[hosts[host]];
 	type="glyphicon-stop";

control/templates/control/controlPanelNew.html

@@ -113,7 +113,7 @@ <h4 style="padding:3px;margin:0">
 	    <div class="row" style="overflow-y:auto">
 	      <!-- Quick status funny face -->
 	      <div class="col-sm-2 col-xs-12">
-		<strong>Quick Status</strong>
+		<strong>Trigger Status (Beta)</strong>
 		<hr style="margin:0;padding:0;margin-bottom:20px">
 		<div id="theimage" style="width:100%;height:90%">
                 </div>
@@ -134,9 +134,9 @@ <h4 style="padding:3px;margin:0">
 		<strong>Event rate: </strong>
                 <span id="trigger_event_rate"></span> events/s
 		<div class="row">
-		  <div class="col-xs-2"><strong>Buffer</strong></div>
+		  <!--<div class="col-xs-2"><strong>Buffer</strong></div>
                   <div class="col-xs-10 progress" style="margin-bottom:5px;padding:0;position:relative;"
-                       id="eb_lag_progress"></div>
+                       id="eb_lag_progress"></div>-->
                   <div class="col-xs-12"><strong>Triggering: </strong>
                     <span id="eb_working"></span>
                   </div>
@@ -527,9 +527,9 @@ <h3>Muon Veto</h3>
         document.getElementById("busy_tot_progress").innerHTML = GetGradProgress(data['deadtime_total'],
 				   "dead time", 0.1, 0.5, data['deadtime_total']*100, "%");
 	document.getElementById("busy_progress").innerHTML=GetGradProgress(busy, "dead time", 0.1, 0.5, busy*100, "%");
-	document.getElementById("eb_lag_progress").innerHTML = GetGradProgress(
-            data['eventbuilder_info']['eventbuilder_queue_size']/10000, "in queue",
-            0.3, 0.7, data['eventbuilder_info']['eventbuilder_queue_size'], " events");
+	//document.getElementById("eb_lag_progress").innerHTML = GetGradProgress(
+        //    data['eventbuilder_info']['eventbuilder_queue_size']/10000, "in queue",
+        //    0.3, 0.7, data['eventbuilder_info']['eventbuilder_queue_size'], " events");
          if(data['eventbuilder_info']['working_on_run']==true)
             document.getElementById("eb_working").innerHTML="Yes";
          else

control/views.py

@@ -61,19 +61,21 @@ def GetTPCEventRate(request):
             doc = monDB[collection].find_one({"data_type": "batch_info"},
                                              sort=[("_id", -1)])
             newest = collection
-            if doc is not None: 
+            rundoc = runsDB.find_one({"name": newest, "detector": "tpc"})
+
+            if doc is not None and rundoc is not None: 
                 break
+            
         if doc is not None:
             rnum = newest
-            rundoc = runsDB.find_one({"name": rnum, "detector": "tpc"})
             start = rundoc['start']
             timestamp = (start - datetime.datetime(1970,1,1)).total_seconds()
             retdoc['rate'] = doc['events_built']/21.
             retdoc['time'] = str(timestamp+doc['last_time_searched']/1000000000.),
             retdoc['rname'] = rnum
             retdoc['rnumber'] = rundoc['number']
     except Exception as e:
-        logger.error("Error " + str(e))
+        logger.error("Error status:" + str(e)+" "+str(newest))
 
     try:
         dead_time_doc = monDB[newest].find({"data_type": 
@@ -91,7 +93,7 @@ def GetTPCEventRate(request):
                           "busytime": "$count", "totaltime": "$tot"}}])))[0]
         retdoc['deadtime_total'] = dead_time_doc['deadtime']
     except Exception as e:
-        logger.error("Error " + str(e))
+        logger.error("Error deadtime run:" + str(e))
 
     # Pipeline status this run
     try:
@@ -101,7 +103,7 @@ def GetTPCEventRate(request):
         retdoc['eb1:27000'] = dead_time_doc["eb1:27000"]
         retdoc['eb2:27000'] = dead_time_doc["eb2:27000"]        
     except Exception as e:
-        logger.error("Error " + str(e))
+        logger.error("Error deadtime: " + str(e))
 
     # Eventbuilder queue and checkin
     try:
@@ -111,7 +113,7 @@ def GetTPCEventRate(request):
         retdoc['eventbuilder_info']['time'] = (retdoc['eventbuilder_info']['time']- datetime.datetime(1970,1,1)).total_seconds()
 
     except Exception as e:
-        logger.error("Error " + str(e))
+        logger.error("Error pipeline: " + str(e))
 
     return HttpResponse(dumps(retdoc),
                         content_type="application/json")

management/templates/management/user_management.html

@@ -44,7 +44,7 @@
     <!--<h3>User Management</h3>-->
   </div>
   <div class="col-xs-1 col-sm-1 col-xs-offset-8">
-    {% if request.user.username == "messina" or request.user.username == "coderre" %}
+    {% if request.user.username == "messina" or request.user.username == "coderre" or request.user.username == "murra" %}
     <button data-toggle="modal" onclick="NewUser()" class="btn btn-info pull-right" style="margin-top:10px;">+ NewUser </button>
     {% endif %}
   </div>

monitor/views.py

@@ -1513,7 +1513,8 @@ def getWaveform(request):
         cursor = database[collection].find(searchdict).limit(30)
         if cursor.count() < 10:
             continue
-        
+
+        logger.error(str(cursor.count()) + " events in collection " + collection)
         # Found something, fill ret dictionary
         retdict = {"collection": collection, "waveforms": [],
                    "ret": 'success'}

runs/templates/runs/runs_new.html

@@ -66,7 +66,8 @@
 	<input type="text" id="form_query"></input> </div>
       <div class="col-xs-1">
         <button class="btn btn-info btn-sm" onclick="RefreshTable()" style="height:30%;padding-left:50px;padding-right:50px;margin:8px;">Search</button>
-	<!--<a class="btn btn-warning btn-sm" href="/runs/?startdate=&enddate=&detector=tpc&custom=%7B%22trigger.events_built%22%3A+%7B%22%24gt%22%3A+0%7D%2C+%22%24or%22%3A%09%5B%7B%22data.host%22%3A+%7B+%22%24nin%22%3A+%5B%22midway-login1%22%5D%7D%7D%2C%7B%22data.host%22%3A+%7B+%22%24nin%22%3A+%5B%22tegner-login-1%22%5D%7D%7D%2C+%7B%22data.status%22%3A+%22error%22%7D%5D%2C%22number%22%3A+%7B%22%24gt%22%3A+1000%7D%7D&submit=">Show transfer errors</a>-->
+	<button class="btn btn-warning btn-sm" 
+		onclick="ShowTransferErrors()">Show transfer errors</button>
 
       </div>
     </div>
@@ -220,8 +221,12 @@ <h4 class="modal-title">Help</h4>
 
 });
 
+function ShowTransferErrors(){
+  $("#form_query").val('{"data": {"$elemMatch": {"status": "error"}}}');
+  RefreshTable();
+}
 function RefreshTable(){
-
+console.log("Refresh");
    runs_url = "/runs/runs_stream";
    // Get Options
    var detector = $('#form_detector').find(":selected").val();
@@ -312,7 +317,7 @@ <h4 class="modal-title">Help</h4>
 <script id="template_tagbutton" type="text/html">
 
   <span class="tagButton">
-    <a style="color:white;cursor:pointer;" onclick="ShowTag('{% verbatim %}{{ name }}{% endverbatim %}')">{% verbatim %}{{ tagname }}{% endverbatim %} </a>    
+    <a style="color:white;cursor:pointer;" data-toggle="tooltip" title="Added by {% verbatim %}{{ user }}{% endverbatim %}" onclick="ShowTag('{% verbatim %}{{ name }}{% endverbatim %}')">{% verbatim %}{{ tagname }}{% endverbatim %} </a>    
     <div {% verbatim %}{{{ hideifnotme }}}{% endverbatim %}>
 
       <span class="badge" style="cursor:hand;cursor:pointer;"