Modifications for train running in pp (D. Sakata)
authorkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 7 Jun 2012 15:55:17 +0000 (15:55 +0000)
committerkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 7 Jun 2012 15:55:17 +0000 (15:55 +0000)
PWGJE/UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.cxx
PWGJE/UserTasks/AliAnalysisTaskJetHadronCorrelation.cxx
PWGJE/macros/AddTaskJetCluster.C

index 63c39c4..8c02b4d 100755 (executable)
@@ -321,18 +321,14 @@ void AliAnalysisTaskCheckSingleTrackJetRejection::UserExec(Option_t *)
                                                                }
                                }
 
-                               if(fNonStdFile.Length()!=0){
-                                                               // case we have an AOD extension - fetch the jets from the extended output
-
-                                                               AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
-                                                               fAODExtension = (aodH?aodH->GetExtension(fNonStdFile.Data()):0);
-                                                               if(!fAODExtension){
-                                                                                               if(fDebug>1)Printf("AODExtension not found for %s",fNonStdFile.Data());
-                                                               }
-                               }
-
-
-
+                               //if(fNonStdFile.Length()!=0){
+                               //                              // case we have an AOD extension - fetch the jets from the extended output
+                               //                              AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
+                               //                              fAODExtension = (aodH?aodH->GetExtension(fNonStdFile.Data()):0);
+                               //                              if(!fAODExtension){
+                               //                                                              if(fDebug>1)Printf("AODExtension not found for %s",fNonStdFile.Data());
+                               //                              }
+                               //}
                                //fAODIn = dynamic_cast<AliAODEvent*>(InputEvent());
                                if (!fAODIn) {
                                                                Printf("ERROR %s : fAODIn not available",(char*)__FILE__);
index 2720c09..740104d 100755 (executable)
@@ -467,18 +467,14 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                }
                                }
 
-                               if(fNonStdFile.Length()!=0){
-                                                               // case we have an AOD extension - fetch the jets from the extended output
-
-                                                               AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
-                                                               fAODExtension = (aodH?aodH->GetExtension(fNonStdFile.Data()):0);
-                                                               if(!fAODExtension){
-                                                                                               if(fDebug>1)Printf("AODExtension not found for %s",fNonStdFile.Data());
-                                                               }
-                               }
-
-
-
+                               //if(fNonStdFile.Length()!=0){
+                               //                              // case we have an AOD extension - fetch the jets from the extended output
+                               //                              AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
+                               //                              fAODExtension = (aodH?aodH->GetExtension(fNonStdFile.Data()):0);
+                               //                              if(!fAODExtension){
+                               //                                                              if(fDebug>1)Printf("AODExtension not found for %s",fNonStdFile.Data());
+                               //                              }
+                               //}
                                //fAODIn = dynamic_cast<AliAODEvent*>(InputEvent());
                                if (!fAODIn) {
                                                                Printf("ERROR %s : fAODIn not available",(char*)__FILE__);
@@ -673,6 +669,12 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                                                fH2JetsJetMCAKT04_Aj->Fill(Leading_pt,Aj);
                                                                                                                                fH2JetsJetMCAKT04_pt->Fill(Leading_pt,sLeading_pt);
                                                                                                }
+
+                                                                                               for(int eb=0;eb<5;eb++){//count number of Di-Jet in pt bin
+                                                                                                                               if(TMath::Abs(Leading_pt -20.*(eb+1))<10.){
+                                                                                                                                                               if(algorithm==0)fH1AKT04_ndiJ_ediv[eb]->Fill(1);
+                                                                                                                               }
+                                                                                               }
                                                                }
                                                                if(algorithm==0)findsLJet=findsLJetAOD;
                                                                if(algorithm==1)findsLJet=findsLJetMC2;
@@ -682,11 +684,6 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                if(algorithm>=2)continue;
 
                                                                if((findsLJet)&&(Leading_pt>10.)&&(sLeading_pt>10.)){
-                                                                                               for(int eb=0;eb<5;eb++){//count number of Di-Jet in pt bin
-                                                                                                                               if(TMath::Abs(Leading_pt -20.*(eb+1))<10.){
-                                                                                                                                                               if(algorithm==0)fH1AKT04_ndiJ_ediv[eb]->Fill(1);
-                                                                                                                               }
-                                                                                               }
                                                                                                fJetBranch = "tracks";
                                                                                                TClonesArray* tracks = dynamic_cast <TClonesArray*> (fAODIn->FindListObject(fJetBranch.Data()));
                                                                
index 56dbec6..984ff61 100644 (file)
@@ -1,4 +1,4 @@
-AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec = "AOD",char* bGen = "",UInt_t filterMask = 16, UInt_t iPhysicsSelectionFlag = AliVEvent::kAny,Char_t *jf = "KT", Float_t radius = 0.4,Int_t nSkip = 0,Int_t kWriteAOD = kFALSE,char* deltaFile = "",Float_t ptTrackCut = 0.15, Float_t etaTrackWindow = 0.9,Float_t vertexWindow = 10.,Int_t nSkipCone = 2);
+AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec = "AOD",char* bGen = "",UInt_t filterMask = 16, UInt_t iPhysicsSelectionFlag = AliVEvent::kAny,Char_t *jf = "KT", Float_t radius = 0.4,Int_t nSkip = 0,Int_t kWriteAOD = kFALSE,char* deltaFile = "",Float_t ptTrackCut = 0.15, Float_t etaTrackWindow = 0.9,Float_t vertexWindow = 10.,Int_t nSkipCone = 2,Int_t dice=0,Int_t smear=0);
 
 Int_t kBackgroundModeCl = 0;
 Float_t kPtTrackCutCl = 0.15;
@@ -30,7 +30,7 @@ AliAnalysisTaskJetCluster *AddTaskJetClusterDelta(UInt_t filterMask = 16,Bool_t
  }
 
 
-AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec,char* bGen ,UInt_t filterMask,UInt_t iPhysicsSelectionFlag,Char_t *jf,Float_t radius,Int_t nSkip,Int_t kWriteAOD,char *deltaFile,Float_t ptTrackCut,Float_t etaTrackWindow,Float_t vertexWindow,Int_t nSkipCone)
+AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec,char* bGen ,UInt_t filterMask,UInt_t iPhysicsSelectionFlag,Char_t *jf,Float_t radius,Int_t nSkip,Int_t kWriteAOD,char *deltaFile,Float_t ptTrackCut,Float_t etaTrackWindow,Float_t vertexWindow,Int_t nSkipCone,Int_t dice,Int_t smear)
  {
  // Creates a jet fider task, configures it and adds it to the analysis manager.
    kPtTrackCutCl = ptTrackCut;
@@ -73,7 +73,10 @@ AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec,char* bGen ,UInt_t filte
     cAdd += Form("_Filter%05d",filterMask);
     cAdd += Form("_Cut%05d",(int)(1000.*kPtTrackCutCl));
     cAdd += Form("_Skip%02d",nSkip);
-    Printf("%s %E",cAdd.Data(),kPtTrackCutCl);
+    if(dice>0 || smear>0)
+      cAdd += Form("Detector%d%d",dice,smear);
+
+    Printf("%s %E %d %d",cAdd.Data(),kPtTrackCutCl,dice,smear);
     AliAnalysisTaskJetCluster* clus = new  AliAnalysisTaskJetCluster(Form("JetCluster%s_%s%s",bRec,jf,cAdd.Data()));
       
    // or a config file
@@ -157,11 +160,11 @@ AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec,char* bGen ,UInt_t filte
    // Create ONLY the output containers for the data produced by the task.
    // Get and connect other common input/output containers via the manager as below
    //==============================================================================
-   AliAnalysisDataContainer *coutput1_Spec = mgr->CreateContainer(Form("cluster_%s_%s_%s%s",bRec,bGen,jf,cAdd.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWGJE_cluster_%s_%s_%s%s",AliAnalysisManager::GetCommonFileName(),bRec,bGen,jf,cAdd.Data()));
+   AliAnalysisDataContainer *coutput1_clus = mgr->CreateContainer(Form("cluster_%s_%s_%s%s",bRec,bGen,jf,cAdd.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,Form("%s:PWGJE_cluster_%s_%s_%s%s",AliAnalysisManager::GetCommonFileName(),bRec,bGen,jf,cAdd.Data()));
 
    mgr->ConnectInput  (clus, 0, mgr->GetCommonInputContainer());
    mgr->ConnectOutput (clus, 0, mgr->GetCommonOutputContainer());
-   mgr->ConnectOutput (clus,  1, coutput1_Spec );
+   mgr->ConnectOutput (clus,  1, coutput1_clus );
    
    return clus;
 }