Fixed format in printouts. Changed temp directory in merging to be current directory

diff --git a/ANALYSIS/AliAnalysisAlien.cxx b/ANALYSIS/AliAnalysisAlien.cxx
index 23d479bf40f3ed4245bebf5782f7af927fd2fc2e..64e6ae7e63cf65a77ac19e9ca2a1132505c28b8a 100644 (file)
--- a/ANALYSIS/AliAnalysisAlien.cxx
+++ b/ANALYSIS/AliAnalysisAlien.cxx
@@ -1766,6 +1766,8 @@ Bool_t AliAnalysisAlien::MergeOutputs()
       gEnv->SetValue("XNet.ReconnectTimeout",10);
       gEnv->SetValue("XNet.FirstConnectMaxCnt",1);
    }   
+   // Make sure we change the temporary directory
+   gSystem->Setenv("TMPDIR", gSystem->pwd());
    TObjArray *list = fOutputFiles.Tokenize(",");
    TIter next(list);
    TObjString *str;
@@ -2362,6 +2364,9 @@ void AliAnalysisAlien::WriteAnalysisMacro()
          out << "   gEnv->SetValue(\"XNet.ReconnectTimeout\",10);" << endl;
          out << "   gEnv->SetValue(\"XNet.FirstConnectMaxCnt\",1);" << endl << endl;
       }   
+      // Change temp directory to current one
+      out << "// Set temporary merging directory to current one" << endl;
+      out << "   gSystem->Setenv(\"TMPDIR\", gSystem->pwd());" << endl << endl;   
       out << "// connect to AliEn and make the chain" << endl;
       out << "   if (!TGrid::Connect(\"alien://\")) return;" << endl;
       if (IsUsingTags()) {
@@ -2694,7 +2699,10 @@ void AliAnalysisAlien::WriteMergingMacro()
          out << "   gEnv->SetValue(\"XNet.MaxRedirectCount\",2);" << endl;
          out << "   gEnv->SetValue(\"XNet.ReconnectTimeout\",10);" << endl;
          out << "   gEnv->SetValue(\"XNet.FirstConnectMaxCnt\",1);" << endl << endl;
-      }   
+      }
+      // Change temp directory to current one
+      out << "// Set temporary merging directory to current one" << endl;
+      out << "   gSystem->Setenv(\"TMPDIR\", gSystem->pwd());" << endl << endl;   
       out << "// Connect to AliEn" << endl;
       out << "   if (!TGrid::Connect(\"alien://\")) return;" << endl;
       out << "   TString outputDir = \"" << fGridOutputDir << "/\";" << endl;  

diff --git a/ANALYSIS/AliAnalysisTaskAddObject.cxx b/ANALYSIS/AliAnalysisTaskAddObject.cxx
index 1fab88eb73287dd3fc271fe180117037ba69ab92..6b65574d2887dd85f49255965bfcb7655bb90035 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskAddObject.cxx
+++ b/ANALYSIS/AliAnalysisTaskAddObject.cxx
@@ -115,7 +115,7 @@ void AliAnalysisTaskAddObject::Exec(Option_t */*option*/)
 {
 
        //      if (fDebug > 1) {
-       Long_t entry = fESDhandler->GetReadEntry();
+       Long64_t entry = fESDhandler->GetReadEntry();
        AliDebug(2,Form("AliAnalysisTaskAddObject::Exec() %s ==> processing event %lld", fESDhandler->GetTree()->GetCurrentFile()->GetName(),entry));
        //}  
        fESDInput = fESDhandler->GetEvent();

diff --git a/ANALYSIS/AliCollisionNormalization.cxx b/ANALYSIS/AliCollisionNormalization.cxx
index 436a1fcbfbcb873785f37d5f7a494a8a0c7dd05e..252187aeffc85d8434165e47dc8b20bcf6d413e1 100644 (file)
--- a/ANALYSIS/AliCollisionNormalization.cxx
+++ b/ANALYSIS/AliCollisionNormalization.cxx
@@ -305,7 +305,7 @@ Double_t AliCollisionNormalization::ComputeNint() {
     Int_t cint1E = (Int_t) fHistStatBin0->GetBinContent(icol,4);      
     bg   = cint1A + cint1C-2*cint1E ;
     if (cint1B != triggeredEventsWith0MultWithBG) {
-      AliWarning(Form("Events in bin0 from physics selection and local counter not consistent: %d - %d", cint1B, triggeredEventsWith0MultWithBG));
+      AliWarning(Form("Events in bin0 from physics selection and local counter not consistent: %d - %d", cint1B, (Int_t)triggeredEventsWith0MultWithBG));
     }
   }
 
@@ -674,7 +674,7 @@ void AliCollisionNormalization::GetRelativeFractions(Int_t origin, Float_t& ref_
       }    
   } 
   else {
-    AliFatal(Form("Unknown energy %f", origin, fEnergy));
+    AliFatal(Form("Unknown energy %f", fEnergy));
   }
     
 }

diff --git a/ANALYSIS/AliTriggerAnalysis.cxx b/ANALYSIS/AliTriggerAnalysis.cxx
index 21742b8665ac4b5d92e34d28667897878b4e1a93..3349286b7bc1b508d0b6640530ab3a2a7d799be2 100644 (file)
--- a/ANALYSIS/AliTriggerAnalysis.cxx
+++ b/ANALYSIS/AliTriggerAnalysis.cxx
@@ -1050,7 +1050,7 @@ void AliTriggerAnalysis::PrintTriggerClasses() const
   {
     TParameter<Long64_t>* param = static_cast<TParameter<Long64_t>*> (fTriggerClasses->GetValue(obj));
     
-    Printf(" %s: %lld triggers", obj->String().Data(), param->GetVal());
+    Printf(" %s: %ld triggers", obj->String().Data(), (Long_t)param->GetVal());
     
     TObjArray* tokens = obj->String().Tokenize(" ");
     for (Int_t i=0; i<tokens->GetEntries(); i++)
@@ -1075,7 +1075,7 @@ void AliTriggerAnalysis::PrintTriggerClasses() const
   {
     TParameter<Long64_t>* param = static_cast<TParameter<Long64_t>*> (singleTrigger.GetValue(obj));
     
-    Printf("  %s: %lld triggers", obj->String().Data(), param->GetVal());
+    Printf("  %s: %ld triggers", obj->String().Data(), (Long_t)param->GetVal());
   }
   delete iter;
   

diff --git a/ANALYSIS/Tender/AliTender.cxx b/ANALYSIS/Tender/AliTender.cxx
index b79ed4018d96c9f2d114a5b10f5e0f9c8d15060b..dd3273d88411bdea5f699dd3ae54f2f45d19875a 100644 (file)
--- a/ANALYSIS/Tender/AliTender.cxx
+++ b/ANALYSIS/Tender/AliTender.cxx
@@ -129,7 +129,7 @@ void AliTender::UserExec(Option_t* /*option*/)
 //
 // Execute all supplied analysis of one event. Notify run change via RunChanged().
   if (fDebug > 1) {
-    Long_t entry = fESDhandler->GetReadEntry();
+    Long64_t entry = fESDhandler->GetReadEntry();
     Printf("AliTender::Exec() %s ==> processing event %lld\n", fESDhandler->GetTree()->GetCurrentFile()->GetName(),entry);
   }  
   fESD = fESDhandler->GetEvent();