X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=SHUTTLE%2FAliShuttle.cxx;h=f83a4f49f1f70209e2b4f4a107834c961295bbeb;hb=1415d3f9eeff627143207700f00d4b67e6b7c40c;hp=e785adef429c638069f488005230a29801dc1991;hpb=c8b76a1866f09dc1e1a8f814eb7cd9c2c329c035;p=u%2Fmrichter%2FAliRoot.git

diff --git a/SHUTTLE/AliShuttle.cxx b/SHUTTLE/AliShuttle.cxx
index e785adef429..f83a4f49f1f 100644
--- a/SHUTTLE/AliShuttle.cxx
+++ b/SHUTTLE/AliShuttle.cxx
@@ -2022,38 +2022,45 @@ AliShuttleLogbookEntry* AliShuttle::QueryRunParameters(Int_t run)
 	UInt_t startTime = entry->GetStartTime();
 	UInt_t endTime = entry->GetEndTime();
 	Bool_t ecsSuccess = entry->GetECSSuccess();
-	
-	TString totEventsStr = entry->GetRunParameter("totalEvents");  
-	Int_t totEvents = totEventsStr.Atoi();
+	TString runType = entry->GetRunType();
+	TString tmpdaqstartTime = entry->GetRunParameter("DAQ_time_start");
+	UInt_t daqstartTime = tmpdaqstartTime.Atoi();
 	
 	UInt_t now = time(0);
-	// TODO make this a configuration parameter
 	Int_t dcsDelay = fConfig->GetDCSDelay()+fConfig->GetDCSQueryOffset();
-	
-	// runs are accepted if they have ecsSuccess set or more than 1 event
-	if (startTime != 0 && endTime != 0 && endTime > startTime && (totEvents > 1 || ecsSuccess) && (endTime < now - dcsDelay))
-	{
-		if (ecsSuccess == kFALSE)
-			Log("SHUTTLE", Form("Processing run %d although in status ECS failure, Reason: %s", run, entry->GetRunParameter("eor_reason")));
-		return entry;
-	}
 
 	Bool_t skip = kFALSE;
 				
-	if (endTime != 0 && endTime >= now - dcsDelay)
-	{
-		Log("SHUTTLE", Form("Skipping run %d for now, because DCS buffer time is not yet expired", run));
-	}
-	else if (totEvents <= 1) 
-	{
-		Log("SHUTTLE", Form("QueryRunParameters - Run %d has 1 event or less - Skipping!", run));
+	// runs are processed if
+	//   a) runType is PHYSICS and ecsSuccess is set
+	//   b) runType is not PHYSICS and (ecsSuccess is set or DAQ_time_start is non-0)
+	// effectively this means that all runs are processed that started properly (ecsSucess behaviour is different for PHYSICS and non-PHYSICS runs (check with ECS!)
+	if (startTime != 0 && endTime != 0 && endTime > startTime) { 
+	  if (endTime >= now - dcsDelay) {
+	    Log("SHUTTLE", Form("Skipping run %d for now, because DCS buffer time is not yet expired", run));
+	  } else {
+	    if (runType == "PHYSICS") {
+	      if (ecsSuccess) {
+		return entry;
+	      } else {
+		Log("SHUTTLE", Form("QueryRunParameters - Run type for run %d is PHYSICS but ECS success flag not set (Reason = %s) - Skipping!", run, entry->GetRunParameter("eor_reason")));
 		skip = kTRUE;
-	}
-	else
-	{
-		Log("SHUTTLE", Form("QueryRunParameters - Invalid parameters for Run %d: "
-			"startTime = %d, endTime = %d. Skipping (Shuttle won't be marked as DONE)!",
-			run, startTime, endTime));
+	      } 
+	    } else {
+	      if (ecsSuccess || daqstartTime > 0) {
+		if (ecsSuccess == kFALSE)
+		  Log("SHUTTLE", Form("Processing run %d although in status ECS failure (Reason: %s), since run type != PHYSICS and DAQ_time_start != 0", run, entry->GetRunParameter("eor_reason")));
+		return entry;
+	      } else {
+		Log("SHUTTLE", Form("QueryRunParameters - Run type for run %d is %s, ECS success flag was not set (Reason = %s) and DAQ_time_start was NULL - Skipping!", run, runType.Data(), entry->GetRunParameter("eor_reason")));
+		skip = kTRUE;
+	      }
+	    }
+	  }
+	} else {
+	  Log("SHUTTLE", Form("QueryRunParameters - Invalid parameters for Run %d: "
+			      "startTime = %d, endTime = %d. Skipping (Shuttle won't be marked as DONE)!",
+			      run, startTime, endTime));
 	}
 	
 	if (skip)
@@ -3449,7 +3456,7 @@ const char* AliShuttle::GetTriggerConfiguration()
 	
 	if (result->GetRowCount() == 0)
 	{
-		Log("SHUTTLE", "ERROR: Trigger configuration not found in logbook_trigger_config");
+		Log("SHUTTLE", "WARNING: Trigger configuration not found in logbook_trigger_config");
 		delete result;
 		return 0;
 	}
@@ -3476,6 +3483,100 @@ const char* AliShuttle::GetTriggerConfiguration()
 	return triggerConfig;
 }
 
+//______________________________________________________________________________________________
+const char* AliShuttle::GetCTPTimeParams()
+{
+	// Receives the CTP time parameters from the DAQ logbook for the current run
+	
+	// check connection, if needed reconnect
+	if (!Connect(3)) 
+		return 0;
+
+	TString sqlQuery;
+	sqlQuery.Form("SELECT alignmentFile FROM logbook_trigger_config WHERE run = %d", GetCurrentRun());
+	TSQLResult* result = fServer[3]->Query(sqlQuery);
+	if (!result)
+	{
+		Log("SHUTTLE", Form("ERROR: Can't execute query <%s>!", sqlQuery.Data()));
+		return 0;
+	}
+	
+	if (result->GetRowCount() == 0)
+	{
+		Log("SHUTTLE", "WARNING: CTP time params not found in logbook_trigger_config");
+		delete result;
+		return 0;
+	}
+	
+	TSQLRow* row = result->Next();
+	if (!row)
+	{
+		Log("SHUTTLE", "ERROR: Could not receive logbook_trigger_config data");
+		delete result;
+		return 0;
+	}
+
+	// static, so that pointer remains valid when it is returned to the calling class	
+	static TString triggerTimeParams(row->GetField(0));
+	
+	delete row;
+	row = 0;
+	
+	delete result;
+	result = 0;
+	
+	Log("SHUTTLE", Form("Found trigger time parameters: %s", triggerTimeParams.Data()));
+	
+	return triggerTimeParams;
+}
+
+//______________________________________________________________________________________________
+const char* AliShuttle::GetTriggerDetectorMask()
+{
+	// Receives the trigger detector mask from DAQ logbook
+	
+	// check connection, if needed reconnect
+	if (!Connect(3)) 
+		return 0;
+
+	TString sqlQuery;
+	sqlQuery.Form("SELECT BIN(BIT_OR(inputDetectorMask)) from logbook_trigger_clusters WHERE run = %d;", GetCurrentRun());
+	TSQLResult* result = fServer[3]->Query(sqlQuery);
+	if (!result)
+	{
+		Log("SHUTTLE", Form("ERROR: Can't execute query <%s>!", sqlQuery.Data()));
+		return 0;
+	}
+	
+	if (result->GetRowCount() == 0)
+	{
+		Log("SHUTTLE", "ERROR: Trigger Detector Mask not found in logbook_trigger_clusters");
+		delete result;
+		return 0;
+	}
+	
+	TSQLRow* row = result->Next();
+	if (!row)
+	{
+		Log("SHUTTLE", "ERROR: Could not receive logbook_trigger_clusters data");
+		delete result;
+		return 0;
+	}
+
+	// static, so that pointer remains valid when it is returned to the calling class	
+	static TString triggerDetectorMask(row->GetField(0));
+	
+	delete row;
+	row = 0;
+	
+	delete result;
+	result = 0;
+	
+	Log("SHUTTLE", Form("Found Trigger Detector Mask: %s", triggerDetectorMask.Data()));
+	
+	return triggerDetectorMask;
+}
+
 //______________________________________________________________________________________________
 void AliShuttle::SetShuttleTempDir(const char* tmpDir)
 {