Initial version of online reco ready and tried at P2. Modifications include correctio...

diff --git a/MONITOR/onlineReco.C b/MONITOR/onlineReco.C
index 46da2166255b594bdb1631cf824fcabe57e9215b..4d6927d15d819496a5d380b77871c567ee7a8904 100644 (file)
--- a/MONITOR/onlineReco.C
+++ b/MONITOR/onlineReco.C
@@ -21,28 +21,27 @@ UInt_t onlineReco(const char* param = "listen",const char *recMacroPath = "$ALIC
   }
 
   if (run > 0) {
-    TString gdcList;
-    if (grp(run) > 0) {
+    TString gdc;
+    if (grp(run,gdc) > 0) {
 
       // "t" stores the token on this disk, otherwise the alien connection is not thread/process-safe
       TGrid::Connect("alien://", 0, 0, "t");
 
-      TObjArray *gdcs = gdcList.Tokenize(" ");
-      Int_t ngdcs = tokens->GetEntriesFast();
-      if (ngdcs > 0) {
+      if (!gdc.IsNull()) {
 
-       TString dataSource = ((TObjString*)gdcs->At(0))->String();
+       TString dataSource = gdc;
        dataSource.Prepend("mem://@");
-       datasource.Append(":");
+       dataSource.Append(":");
 
        // Setting CDB
        AliCDBManager * man = AliCDBManager::Instance();
-       man->SetDefaultStorage("raw://");
+       //      man->SetDefaultStorage("raw://");
+       man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
        man->SetSpecificStorage("GRP/GRP/Data",
                              Form("local://%s",gSystem->pwd()));
        man->SetSpecificStorage("GRP/CTP/Config",
                              Form("local://%s",gSystem->pwd()));
-       man->Lock();
+       man->SetLock(kTRUE);
 
        gSystem->mkdir(Form("run%d",run));
        gSystem->cd(Form("run%d",run));
@@ -66,11 +65,11 @@ UInt_t onlineReco(const char* param = "listen",const char *recMacroPath = "$ALIC
 
 }
 
-Int_t grp(UInt_t run, TString &gdcList) {
+Int_t grp(UInt_t run, TString &gdc) {
 
   Int_t ret=AliGRPPreprocessor::ReceivePromptRecoParameters(run, "aldaqdb", 0, "LOGBOOK", "logbook", "alice",
                                                            Form("local://%s",gSystem->pwd()),
-                                                           gdcList);
+                                                           gdc);
   if(ret>0) cout << "Last run of the same type is: " << ret << endl;
   else if(ret==0) cout << "No previous run of the same type found" << endl;
   else if(ret<0) cout << "Error code while retrieving GRP parameters returned: " << ret << endl;

diff --git a/STEER/AliGRPPreprocessor.cxx b/STEER/AliGRPPreprocessor.cxx
index e2e36d10f4441b9eba660f0c90024973a2f93da4..40acbf312dde5fc4fcaf0934ebef9a768f93ad00 100644 (file)
--- a/STEER/AliGRPPreprocessor.cxx
+++ b/STEER/AliGRPPreprocessor.cxx
@@ -1524,7 +1524,7 @@ AliDCSSensorArray *AliGRPPreprocessor::GetPressureMap(TMap* dcsAliasMap)
 
   
 //_______________________________________________________________
-Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* dbHost, Int_t dbPort, const char* dbName, const char* user, const char* password, const char *cdbRoot)
+Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* dbHost, Int_t dbPort, const char* dbName, const char* user, const char* password, const char *cdbRoot, TString &gdc)
 {
        //
        // Retrieves logbook and trigger information from the online logbook
@@ -1594,6 +1594,8 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
        UInt_t detectorMask = (UInt_t)(detectorMaskString.Atoi());
        Float_t l3Current = (Float_t)(TMath::Abs(l3CurrentString.Atof()));
        Float_t dipoleCurrent = (Float_t)(TMath::Abs(dipoleCurrentString.Atof()));
+       Char_t l3Polarity = (l3CurrentString.Atof() < 0) ? 1 : 0;
+       Char_t dipolePolarity = (dipoleCurrentString.Atof() < 0) ? 1 : 0;
        
        AliGRPObject * grpObj = new AliGRPObject();
        grpObj->SetTimeStart(timeStart); 
@@ -1601,6 +1603,8 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
        grpObj->SetDetectorMask(detectorMask);
        grpObj->SetL3Current(l3Current,(AliGRPObject::Stats)0);
        grpObj->SetDipoleCurrent(dipoleCurrent,(AliGRPObject::Stats)0);
+       grpObj->SetL3Polarity(l3Polarity);
+       grpObj->SetDipolePolarity(dipolePolarity);
 
        delete row;
        row = 0;
@@ -1681,6 +1685,42 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
                        return -15;
                }
        
+
+       // Receive list of GDCs for this run
+       sqlQuery.Form("SELECT GDC FROM logbook_stats_GDC WHERE run = %d", run);
+       result = server->Query(sqlQuery);
+       if (!result)
+               {
+                       Printf("ERROR: Can't execute query <%s>!", sqlQuery.Data());
+                       return -24;
+               }
+       
+       if (result->GetRowCount() == 0)
+               {
+                       Printf("ERROR: Run %d not found in logbook_stats_GDC", run);
+                       delete result;
+                       return -25;
+               }
+       
+       row = result->Next();
+       if (!row)
+               {
+                       Printf("ERROR: Could not receive logbook_stats_GDC data from run %d", run);
+                       delete result;
+                       return -26;
+               }
+       
+       // For the moment take the first GDC in the list
+       gdc = row->GetField(0);
+       
+       delete row;
+       row = 0;
+       
+       delete result;
+       result = 0;
+       
+       Printf("Found GDC: %s", gdc.Data());
+
        // get last run with same run type that was already processed by the SHUTTLE
        
        sqlQuery.Form("SELECT max(logbook.run) FROM logbook LEFT JOIN logbook_shuttle ON logbook_shuttle.run = logbook.run WHERE run_type = '%s' AND shuttle_done = 1", runType.Data());

diff --git a/STEER/AliGRPPreprocessor.h b/STEER/AliGRPPreprocessor.h
index 6ada26a4bec78f4968978e2c93b19c2374eb1149..f133e8256df47b903401706eb92cb940f861d5cc 100644 (file)
--- a/STEER/AliGRPPreprocessor.h
+++ b/STEER/AliGRPPreprocessor.h
@@ -68,7 +68,8 @@ class AliGRPPreprocessor: public AliPreprocessor {
                                   const char* dbName,
                                   const char* user,
                                   const char* password,
-                                  const char *cdbRoot
+                                  const char *cdbRoot,
+                                 TString &gdc
                                  );
 
  protected: