]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Updating macros for running code
authorcnattras <cnattras@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 13 Aug 2013 22:33:28 +0000 (22:33 +0000)
committercnattras <cnattras@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 13 Aug 2013 22:33:28 +0000 (22:33 +0000)
PWGLF/totEt/macros/AddTaskEMCALTenderForEtAnalysis.C
PWGLF/totEt/macros/ConfigEtMonteCarlo.C
PWGLF/totEt/macros/CreateAlienHandlerCaloEtSim.C
PWGLF/totEt/macros/calculateCorrections.C
PWGLF/totEt/macros/runCaloEt.C

index eead04935210e27d620166c9fdb4c19e6a66a736..d980365ad9c1ac292ed5cf8c07aa83b3a718ca4d 100644 (file)
@@ -1,7 +1,7 @@
 // EMCal tender task adder
 // Author: Jiri Kral
 
-AliTender *AddTaskEMCALTender(const char *geoname="EMCAL_COMPLETEV1", AliEMCALRecParam *pars = 0 )
+AliTender *AddTaskEMCALTender(const char *geoname="EMCAL_COMPLETEV1", AliEMCALRecParam *pars = 0 , Bool_t withNonlinearity = kTRUE , Bool_t withReclusterizing = kFALSE, Int_t trackmatchcuts==0)
 {
   // Parameters: geoname = "EMCAL_FIRSTYEARV1" or "EMCAL_COMPLETEV1" or ""
 
@@ -61,11 +61,23 @@ AliTender *AddTaskEMCALTender(const char *geoname="EMCAL_COMPLETEV1", AliEMCALRe
   // track matching parameters
   //EMCALSupply->SetMass(0.139);
   //EMCALSupply->SetStep(5);
-  EMCALSupply->SwitchOnCutEtaPhiSum(); 
-  EMCALSupply->SetRCut(0.025);
-  //EMCALSupply->SwitchOnCutEtaPhiSeparate();
-  EMCALSupply->SetEtaCut(0.025);
-  EMCALSupply->SetPhiCut(0.05);
+  //EMCALSupply->SwitchOnCutEtaPhiSum(); 
+  //EMCALSupply->SetRCut(0.025);
+  EMCALSupply->SwitchOnCutEtaPhiSeparate();
+//   EMCALSupply->SetEtaCut(0.015);
+//   EMCALSupply->SetPhiCut(0.03);
+  if(trackmatchcuts==0){//default
+    EMCALSupply->SetEtaCut(0.025);
+    EMCALSupply->SetPhiCut(0.05);
+  }
+  if(trackmatchcuts==1){//tighter
+    EMCALSupply->SetEtaCut(0.015);
+    EMCALSupply->SetPhiCut(0.03);
+  }
+  if(trackmatchcuts==2){//looser
+    EMCALSupply->SetEtaCut(0.035);
+    EMCALSupply->SetPhiCut(0.07);
+  }
 
   // switches ---------------------------------------------------------------
   EMCALSupply->SwitchOnBadCellRemove();
@@ -73,7 +85,7 @@ AliTender *AddTaskEMCALTender(const char *geoname="EMCAL_COMPLETEV1", AliEMCALRe
   EMCALSupply->SwitchOnCalibrateEnergy();
   EMCALSupply->SwitchOnCalibrateTime();
   EMCALSupply->SwitchOnUpdateCell();
-  //EMCALSupply->SwitchOnReclustering();
+  if(withReclusterizing) EMCALSupply->SwitchOnReclustering();
   EMCALSupply->SwitchOnClusterBadChannelCheck();
   EMCALSupply->SwitchOnClusterExoticChannelCheck();
   EMCALSupply->SwitchOnCellFiducialRegion();
@@ -81,7 +93,8 @@ AliTender *AddTaskEMCALTender(const char *geoname="EMCAL_COMPLETEV1", AliEMCALRe
   EMCALSupply->SwitchOnRecalculateClusPos();
   EMCALSupply->SwitchOnRecalShowerShape();
   EMCALSupply->SwitchOnRecalDistBadChannel();
-  EMCALSupply->SwitchOnNonLinearityCorrection();
+ if(withNonlinearity) EMCALSupply->SwitchOnNonLinearityCorrection();
+else{cout<<"WARNING:  TURNING OFF NONLINEARITY"<<endl;}
   EMCALSupply->SwitchOnTrackMatch();
   
 
index b6d8f04eb3016f035e6cc7bc179ff8609de94cc1..de3f485a5daf8c0ae750c51b40a4a6ede3d67269 100644 (file)
@@ -22,6 +22,8 @@ AliAnalysisEtMonteCarlo * ConfigEtMonteCarlo(Bool_t EMCAL = true, Bool_t DETAIL
       AliAnalysisEtMonteCarloEmcal *totEtMC = new AliAnalysisEtMonteCarloEmcal();
       //Look at the 2010 Pb+Pb data...
       totEtMC->SetDataSet(20100);
+      totEtMC->CalcTrackMatchVsMult();
+      totEtMC->CalcForKaonCorrection();
       totEtMC->Init();
       return totEtMC;
     }
@@ -30,6 +32,8 @@ AliAnalysisEtMonteCarlo * ConfigEtMonteCarlo(Bool_t EMCAL = true, Bool_t DETAIL
     AliAnalysisEtMonteCarloPhos *totEtMC = new AliAnalysisEtMonteCarloPhos();
     //Look at the 2010 Pb+Pb data...
     totEtMC->SetDataSet(20100);
+      totEtMC->CalcTrackMatchVsMult();
+      totEtMC->CalcForKaonCorrection();
     totEtMC->Init();
     return totEtMC;
   }
index de82dde189c983a3f447f91abc35d0c3f3eec12a..6567b48149d48a00d84e45dc7d3195c55591853b 100644 (file)
@@ -1,4 +1,4 @@
-AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputName, const char * pluginRunMode, int production, Bool_t isPHOS, Bool_t ispp,Bool_t isData)
+AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputName, const char * pluginRunMode, int production, Bool_t isPHOS, Bool_t ispp,Bool_t isData, Int_t runnum)
 {
   // Check if user has a valid token, otherwise make one. This has limitations.
   // One can always follow the standard procedure of calling alien-token-init then
@@ -16,8 +16,8 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
 
   // Set versions of used packages
    plugin->SetAPIVersion("V1.1x");
-   plugin->SetROOTVersion("v5-34-05");
-   plugin->SetAliROOTVersion("v5-04-62-AN");
+   plugin->SetROOTVersion("v5-34-08");
+   plugin->SetAliROOTVersion("v5-05-02-AN");
   // Declare input data to be processed.
 
   // Method 1: Create automatically XML collections using alien 'find' command.
@@ -68,12 +68,40 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
    }
    else{
     if(isData){//185 jobs
-      cout<<"Running over data"<<endl;
-      plugin->SetGridDataDir("/alice/data/2010/LHC10h");//PbPb data
-      plugin->SetDataPattern("*ESDs/pass2/*ESDs.root");
-      plugin->SetRunPrefix("000");   // real data
-      plugin->AddRunNumber(139465);
-      outputDir = outputDir + "LHC10hPass2";
+        cout<<"Running over data"<<endl;
+       if(production==1){
+        plugin->SetGridDataDir("/alice/data/2010/LHC10h");//PbPb data
+        plugin->SetDataPattern("*ESDs/pass2/*ESDs.root");
+        plugin->SetRunPrefix("000");   // real data
+        outputDir = outputDir + "LHC10hPass2";
+        if(runnum==0){
+          plugin->AddRunNumber(139465);
+          outputDir = outputDir + "Run139465";
+        }
+        if(runnum==1){
+          plugin->AddRunNumber(138442);
+          outputDir = outputDir + "Run138442";
+        }
+        if(runnum==2){
+          plugin->AddRunNumber(138364);
+          outputDir = outputDir + "Run138364";
+        }
+        if(runnum==3){
+          plugin->AddRunNumber(138534);
+          outputDir = outputDir + "Run138534";
+        }
+        if(runnum==4){
+          plugin->AddRunNumber(138275);
+          outputDir = outputDir + "Run138275";
+        }
+       }
+       if(production==2){
+        plugin->SetGridDataDir("/alice/data/2011/LHC11h_2");//PbPb data
+        plugin->SetDataPattern("*ESDs/pass2/*ESDs.root");
+        plugin->SetRunPrefix("000");   // real data
+        plugin->AddRunNumber(169099);
+        outputDir = outputDir + "LHC11hPass2";
+       }
     }
     else{
       if(production==0){
@@ -101,6 +129,10 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
 //             plugin->AddRunNumber(137161);
 //             plugin->AddRunNumber(139470);
                plugin->AddRunNumber(139465);//probably our focus now
+//      plugin->AddRunNumber(138442);
+//      plugin->AddRunNumber(138364);
+//      plugin->AddRunNumber(138534);
+//      plugin->AddRunNumber(138275);
       }
       if(production==2){
        if(!isPHOS){
@@ -156,7 +188,7 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
   // is correlated with the run time - count few hours TTL per job, not minutes !
   plugin->SetSplitMaxInputFileNumber(100);
   // Optionally set number of failed jobs that will trigger killing waiting sub-jobs.
-  plugin->SetMaxInitFailed(50);
+  //plugin->SetMaxInitFailed(50);
   // Optionally resubmit threshold.
   //plugin->SetMasterResubmitThreshold(90);
   // Optionally set time to live (default 30000 sec)
index d94f06e764bd4a248b3a7138bcafe52cd14d175c..0a6ae5f98e216f8c24a8c88632e0b914f6c396e5 100644 (file)
@@ -76,11 +76,11 @@ int calculateCorrections(TString filename="rootFiles/LHC11a10a_bis/Et.ESD.simPbP
   
   Float_t maxMult = 99.5;
   Int_t nbins = 100;
-//   if(detector==emcal){
+   if(detector==emcal){
 //     //100 seems to be sufficient...
-//     maxMult = 299.5;
-//     nbins = 300;
-//  }
+     maxMult = 249.5;
+     nbins = 250;
+  }
   TH2I *hChargedVsClusterMult = new TH2I("hChVsMult", "hChVsMult", nbins, -0.5, maxMult, nbins, -0.5, maxMult);
   TH2I *hNeutralVsClusterMult = new TH2I("hNeutVsMult", "hNeutVsMult", nbins, -0.5, maxMult, nbins, -0.5, maxMult);
   TH2I *hGammaVsClusterMult = new TH2I("hGammaVsMult", "hGammaVsMult", nbins, -0.5, maxMult, nbins, -0.5, maxMult);
@@ -206,25 +206,25 @@ int calculateCorrections(TString filename="rootFiles/LHC11a10a_bis/Et.ESD.simPbP
   TH2F  *fHistHadronDepositsAllMult = l->FindObject("fHistHadronDepositsAllCent");
   TH2F  *fHistHadronDepositsRecoMult = l->FindObject("fHistHadronDepositsRecoCent");
   TH2F *eff2D;
-  if(fHistHadronDepositsRecoMult && fHistHadronDepositsAllMult ){
+//   if(fHistHadronDepositsRecoMult && fHistHadronDepositsAllMult ){
     eff2D = (TH2F*) bayneseffdiv2D(fHistHadronDepositsRecoMult,fHistHadronDepositsAllMult,"eff2D");
-  }
-  else{
-    cerr<<"Warning!  Did not calculate reconstruction efficiency!!"<<endl;
-    eff2D =  new TH2F("eff2D", "eff2D",200, 0, 10,20,-0.5,19.5);
-  }
+//   }
+//   else{
+//     cerr<<"Warning!  Did not calculate reconstruction efficiency!!"<<endl;
+//     eff2D =  new TH2F("eff2D", "eff2D",200, 0, 10,20,-0.5,19.5);
+//   }
   //cor->SetReconstructionEfficiency(eff2D);
   
   TH2F  *fHistGammasGeneratedMult = l->FindObject("fHistGammasGeneratedCent");
   TH2F  *fHistGammasFoundMult = l->FindObject("fHistGammasFoundCent");
   TH2F *gammaEff2D;
-  if(fHistGammasGeneratedMult && fHistGammasFoundMult){
+  //if(fHistGammasGeneratedMult && fHistGammasFoundMult){
     gammaEff2D = (TH2F*) bayneseffdiv2D(fHistGammasFoundMult,fHistGammasGeneratedMult,"gammaEff2D");
-  }
-  else{
-    cerr<<"Warning!  Did not calculate reconstruction efficiency!!"<<endl;
-    gammaEff2D =  new TH2F("gammaEff2D", "gammaEff2D",200, 0, 10,20,-0.5,19.5);
-  }
+//   }
+//   else{
+//     cerr<<"Warning!  Did not calculate reconstruction efficiency!!"<<endl;
+//     gammaEff2D =  new TH2F("gammaEff2D", "gammaEff2D",200, 0, 10,20,-0.5,19.5);
+//   }
 
   AliAnalysisEtTrackMatchCorrections *cor = new AliAnalysisEtTrackMatchCorrections(("TmCorrections"+detector).Data(), fitcharged, fitneutral, fitgamma, fitsecondary, *eff2D,
                                                                                   meanCharged, meanNeutral, meanGamma, meanSecondary );
index e5e31a67a9d2c12abf6f23c2a1aa948d531fe67a..71eb773e42759daf273895a2f01761e0ac8f6ea9 100644 (file)
@@ -147,65 +147,65 @@ void runCaloEt(bool submit = false, // true or false
 //       chain->Add("/data/LHC10h8/137161/222/AliESDs.root");//Hijing Pb+Pb
 chain->Add("/data/LHC11a10a_bis/139465/001/AliESDs.root");
 chain->Add("/data/LHC11a10a_bis/139465/002/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/003/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/004/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/006/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/007/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/008/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/009/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/010/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/011/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/012/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/013/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/014/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/015/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/016/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/017/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/018/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/019/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/020/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/021/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/022/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/023/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/024/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/025/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/026/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/027/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/028/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/029/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/030/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/031/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/032/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/033/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/034/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/035/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/036/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/037/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/038/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/039/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/040/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/041/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/042/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/043/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/044/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/045/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/046/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/047/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/048/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/049/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/050/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/051/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/052/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/053/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/054/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/055/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/056/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/057/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/058/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/059/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/060/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/061/AliESDs.root");
-chain->Add("/data/LHC11a10a_bis/139465/062/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/003/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/004/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/006/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/007/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/008/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/009/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/010/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/011/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/012/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/013/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/014/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/015/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/016/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/017/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/018/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/019/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/020/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/021/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/022/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/023/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/024/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/025/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/026/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/027/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/028/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/029/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/030/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/031/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/032/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/033/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/034/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/035/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/036/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/037/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/038/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/039/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/040/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/041/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/042/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/043/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/044/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/045/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/046/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/047/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/048/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/049/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/050/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/051/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/052/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/053/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/054/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/055/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/056/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/057/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/058/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/059/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/060/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/061/AliESDs.root");
+// chain->Add("/data/LHC11a10a_bis/139465/062/AliESDs.root");
 
     }
     else { // pp