LOG muondep:

[u/mrichter/AliRoot.git] / STEER / AliTagCreator.cxx

diff --git a/STEER/AliTagCreator.cxx b/STEER/AliTagCreator.cxx
index c7c1106a28547a6fc3410f9ff06516b78af424f1..0e87a52028857945ca864ffea1918574ec3ad883 100644 (file)
--- a/STEER/AliTagCreator.cxx
+++ b/STEER/AliTagCreator.cxx
@@ -89,7 +89,7 @@ Bool_t AliTagCreator::MergeTags(const char *type) {
     while((name = gSystem->GetDirEntry(dirp))) {
       if (strstr(name,tagPattern)) fgChain->Add(name);  
     }//directory loop
-    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+    AliInfo(Form("Chained tag files: %lld",fgChain->GetEntries()));
   }//local mode
 
   else if(fStorage == 1) {
@@ -103,7 +103,7 @@ Bool_t AliTagCreator::MergeTags(const char *type) {
       TString alienUrl = tagresult->GetKey(i,"turl");
       fgChain->Add(alienUrl);
     }//grid result loop      
-    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+    AliInfo(Form("Chained tag files: %lld",fgChain->GetEntries()));
   }//grid mode
  
   AliRunTag *tag = new AliRunTag;
@@ -177,7 +177,7 @@ Bool_t AliTagCreator::MergeTags(const char *type, const char *inflist) {
       (*istr) >> fname;
       if (strstr(fname, tagPattern)) fgChain->Add(fname);
     }
-    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+    AliInfo(Form("Chained tag files: %lld",fgChain->GetEntries()));
   }
  
   AliRunTag *tag = new AliRunTag;
@@ -224,7 +224,7 @@ Bool_t AliTagCreator::MergeTags(const char *type, TGridResult *result) {
     alienUrl = result->GetKey(i,"turl");
     fgChain->Add(alienUrl);  
   }
-  AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+  AliInfo(Form("Chained tag files: %lld",fgChain->GetEntries()));
   AliRunTag *tag = new AliRunTag;
   fgChain->SetBranchAddress("AliTAG",&tag);
   fgChain->GetEntry(0);
@@ -270,7 +270,7 @@ Bool_t AliTagCreator::MergeTagsForRun(const char* type) {
     while((name = gSystem->GetDirEntry(dirp))) {
       if (strstr(name,tagPattern)) fgChain->Add(name);  
     }//directory loop
-    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+    AliInfo(Form("Chained tag files: %lld",fgChain->GetEntries()));
   }//local mode
 
   else if(fStorage == 1) {
@@ -284,7 +284,7 @@ Bool_t AliTagCreator::MergeTagsForRun(const char* type) {
       TString alienUrl = tagresult->GetKey(i,"turl");
       fgChain->Add(alienUrl);
     }//grid result loop      
-    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+    AliInfo(Form("Chained tag files: %lld",fgChain->GetEntries()));
   }//grid mode
  
   AliRunTag *tag = new AliRunTag;
@@ -332,7 +332,7 @@ Bool_t AliTagCreator::MergeTagsForRun(const char* type, TGridResult *result) {
     alienUrl = result->GetKey(i,"turl");
     fgChain->Add(alienUrl);  
   }
-  AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+  AliInfo(Form("Chained tag files: %lld",fgChain->GetEntries()));
   AliRunTag *tag = new AliRunTag;
   fgChain->SetBranchAddress("AliTAG",&tag);
   fgChain->GetEntry(0);
@@ -403,7 +403,7 @@ Bool_t AliTagCreator::MergeTagsForRun(const char* type, const char *inflist) {
       (*istr) >> fname;
       if (strstr(fname, tagPattern)) fgChain->Add(fname);
     }
-    AliInfo(Form("Chained tag files: %d",fgChain->GetEntries()));
+    AliInfo(Form("Chained tag files: %lld",fgChain->GetEntries()));
   }
  
   AliRunTag *tag = new AliRunTag;
@@ -446,15 +446,19 @@ Bool_t AliTagCreator::MergeToSingleRunTag(TChain *chain, const char *filename)
 
   AliRunTag *tag = new AliRunTag;
   TTree * ttag = new TTree("T","A Tree with event tags");
-  TBranch * btag = ttag->Branch("AliTAG", &tag);
+  TBranch * btag = ttag->Branch("AliTAG", &tag, 1000000);
   btag->SetCompressionLevel(9);
+  ttag->AutoSave("10000");
 
   AliRunTag *rtag = new AliRunTag();
   chain->SetBranchAddress("AliTAG", &rtag);
 
+  AliFileTag *evt;
+
   if (chain->GetEntries()) {
     chain->GetEntry(0);
     tag->CopyStandardContent(rtag);
+    tag->Clear();
 
     int runno = rtag->GetRunId();
 
@@ -465,8 +469,9 @@ Bool_t AliTagCreator::MergeToSingleRunTag(TChain *chain, const char *filename)
        continue;
       }
 
-      for (int iev=0; iev<rtag->GetEventTags()->GetEntries(); iev++) {
-       tag->AddEventTag(*((AliEventTag *) rtag->GetEventTags()->At(iev)));
+      for (int iev=0; iev<rtag->GetNFiles(); iev++) {
+       evt = (AliFileTag *) rtag->GetFileTag(iev);
+       tag->AddFileTag(new AliFileTag(*evt));
       }
     }
   }