remove deprecated event type selection

diff --git a/PWG0/dNdEta/AlidNdEtaTask.cxx b/PWG0/dNdEta/AlidNdEtaTask.cxx
index d27e18b747989949e7d674228821cad94e2b54ac..fe54c9e0caf022ad374edd1895bc4c263a6726aa 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaTask.cxx
+++ b/PWG0/dNdEta/AlidNdEtaTask.cxx
@@ -59,15 +59,12 @@ AlidNdEtaTask::AlidNdEtaTask(const char* opt) :
   fOption(opt),
   fAnalysisMode((AliPWG0Helper::AnalysisMode) (AliPWG0Helper::kTPC | AliPWG0Helper::kFieldOn)),
   fTrigger(AliTriggerAnalysis::kMB1),
-  fRequireTriggerClass(),
-  fRejectTriggerClass(),
   fFillPhi(kFALSE),
   fDeltaPhiCut(-1),
   fReadMC(kFALSE),
   fUseMCVertex(kFALSE),
   fOnlyPrimaries(kFALSE),
   fUseMCKine(kFALSE),
-  fCheckEventType(kFALSE),
   fSymmetrize(kFALSE),
   fMultAxisEta1(kFALSE),
   fDiffTreatment(AliPWG0Helper::kMCFlags),
@@ -171,10 +168,8 @@ void AlidNdEtaTask::ConnectInputData(Option_t *opt)
   AliLog::SetClassDebugLevel("AliMCEvent", AliLog::kWarning - AliLog::kDebug + 1);
   
   #ifdef FULLALIROOT
-    if (fCheckEventType)
-      AliCDBManager::Instance()->SetDefaultStorage("raw://");
-    else
-      AliCDBManager::Instance()->SetDefaultStorage("MC", "Residual");
+    AliCDBManager::Instance()->SetDefaultStorage("raw://");
+    //AliCDBManager::Instance()->SetDefaultStorage("MC", "Residual");
     AliCDBManager::Instance()->SetRun(0);
     
     AliCDBManager* mgr = AliCDBManager::Instance();
@@ -600,17 +595,7 @@ isManager()->GetInputEventHandler());
 
           // vertex stats
           if (strcmp(vtxESD->GetTitle(), "vertexer: 3D") == 0)
-          {
             fStats->Fill(1);
-            if (fCheckEventType && TMath::Abs(vtx[0]) > 0.3)
-            {
-              Printf("Suspicious x-vertex x=%f y=%f z=%f (period: %d orbit %x)", vtx[0], vtx[1], vtx[2], fESD->GetPeriodNumber(), fESD->GetOrbitNumber());
-            }
-            if (fCheckEventType && (vtx[1] < 0.05 || vtx[1] > 0.5))
-            {
-              Printf("Suspicious y-vertex x=%f y=%f z=%f (period: %d orbit %x)", vtx[0], vtx[1], vtx[2], fESD->GetPeriodNumber(), fESD->GetOrbitNumber());
-            }
-          }
           
           if (strcmp(vtxESD->GetTitle(), "vertexer: Z") == 0)
             fStats->Fill(2);

diff --git a/PWG0/dNdEta/AlidNdEtaTask.h b/PWG0/dNdEta/AlidNdEtaTask.h
index 96a63d5ef7813fe915b63f64cc17b1737046da4b..b9585aab105dbc5b40a2516f3a8c8830b037cde2 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaTask.h
+++ b/PWG0/dNdEta/AlidNdEtaTask.h
@@ -36,10 +36,8 @@ class AlidNdEtaTask : public AliAnalysisTaskSE {
     void SetOnlyPrimaries(Bool_t flag = kTRUE) { fOnlyPrimaries = flag; }
     void SetUseMCKine(Bool_t flag = kTRUE) { fUseMCKine = flag; }
     void SetTrigger(AliTriggerAnalysis::Trigger trigger) { fTrigger = trigger; }
-    void SetTriggerClasses(const char* require, const char* reject) { fRequireTriggerClass = require; fRejectTriggerClass = reject; }
     void SetFillPhi(Bool_t flag = kTRUE) { fFillPhi = flag; }
     void SetDeltaPhiCut(Float_t cut) { fDeltaPhiCut = cut; }
-    void SetCheckEventType(Bool_t flag = kTRUE) { fCheckEventType = flag; }
     void SetSymmetrize(Bool_t flag = kTRUE) { fSymmetrize = flag; }
     void SetMultAxisEta1(Bool_t flag = kTRUE) { fMultAxisEta1 = flag; }
     void SetDiffTreatment(AliPWG0Helper::DiffTreatment diffTreatment) { fDiffTreatment = diffTreatment; }
@@ -53,8 +51,6 @@ class AlidNdEtaTask : public AliAnalysisTaskSE {
     TString fOption;                           // option string
     AliPWG0Helper::AnalysisMode fAnalysisMode; // detector that is used for analysis
     AliTriggerAnalysis::Trigger fTrigger;      // trigger that is used
-    TString fRequireTriggerClass;              // trigger class that is required
-    TString fRejectTriggerClass;               // trigger class that is rejected
     Bool_t fFillPhi;                           // if true phi is filled as 3rd coordinate in all maps
     Float_t fDeltaPhiCut;                      // cut in delta phi (only SPD)
 
@@ -62,7 +58,6 @@ class AlidNdEtaTask : public AliAnalysisTaskSE {
     Bool_t  fUseMCVertex;     // the MC vtx is used instead of the ESD vertex (for syst. check)
     Bool_t  fOnlyPrimaries;   // Process only primaries by using the MC information (for syst. check)
     Bool_t  fUseMCKine;       // use the MC values for each found track/tracklet (for syst. check)
-    Bool_t  fCheckEventType;  // check if event type is physics (for real data)
     Bool_t  fSymmetrize;      // move all negative to positive eta
     Bool_t  fMultAxisEta1;    // restrict multiplicity count to |eta| < 1
     AliPWG0Helper::DiffTreatment  fDiffTreatment;  // how to identify SD events (see AliPWG0Helper::GetEventProcessType)

diff --git a/PWG0/dNdEta/run.C b/PWG0/dNdEta/run.C
index 342d2b976af158001e7a1df6e6f16748507384c5..a1eea175e76075babdd1825ab822985f8a1df446 100644 (file)
--- a/PWG0/dNdEta/run.C
+++ b/PWG0/dNdEta/run.C
@@ -19,7 +19,7 @@ void Load(const char* taskName, Bool_t debug)
     AliLog::SetClassDebugLevel(taskName, AliLog::kWarning);
 }
 
-void run(Int_t runWhat, const Char_t* data, Int_t nRuns=20, Int_t offset=0, Bool_t aDebug = kFALSE, Int_t aProof = kFALSE, Int_t requiredData = 1, const char* option = "", const char* requireClass = "", const char* rejectClass = "")
+void run(Int_t runWhat, const Char_t* data, Int_t nRuns=20, Int_t offset=0, Bool_t aDebug = kFALSE, Int_t aProof = kFALSE, Int_t requiredData = 1, const char* option = "")
 {
   // runWhat options: 0 = AlidNdEtaTask
   //                  1 = AlidNdEtaCorrectionTask
@@ -261,10 +261,6 @@ void run(Int_t runWhat, const Char_t* data, Int_t nRuns=20, Int_t offset=0, Bool
     //task->SetDeltaPhiCut(0.064);
     task->SetDiffTreatment(diffTreatment);
 
-    //if (requiredData == 2)
-    //  task->SetCheckEventType();
-    //task->SetTriggerClasses(requireClass, rejectClass);
-
     mgr->AddTask(task);
 
     // Attach input

diff --git a/PWG0/dNdEta/run.sh b/PWG0/dNdEta/run.sh
deleted file mode 100755 (executable)
index 54484e5..0000000
--- a/PWG0/dNdEta/run.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-for I in CINT1A-ABCE-NOPF-ALL CINT1C-ABCE-NOPF-ALL CINT1-E-NOPF-ALL
-#for I in CINT1B-ABCE-NOPF-ALL CINT1A-ABCE-NOPF-ALL CINT1C-ABCE-NOPF-ALL CINT1-E-NOPF-ALL
-do
-  root -b -q 'run.C(0, "/PWG0/jgrosseo/run", -1, 0, 0, 2, 2, "SAVE", "'$I'")'
-done
-