M README.Train - readme file

M      runPWG1Train.C          - steering macro
D      getCertificateAll.sh    - remove obsolete file
D      MakeSDDPoints.C         - removed obsolete file
A      ConfigTask.txt          - new task configuration file
A      getCertificateBatch.sh  - shell script to make chack on batch farm

 getCertificateBuild.sh  - not yet there

diff --git a/PWG1/PWG1macros/ConfigTask.txt b/PWG1/PWG1macros/ConfigTask.txt
new file mode 100644 (file)
index 0000000..d573d9d
--- /dev/null
+++ b/PWG1/PWG1macros/ConfigTask.txt
@@ -0,0 +1,23 @@
+$ALICE_ROOT/PWG1/macros/AddTaskTrackMatchingTPCITS.C
+$ALICE_ROOT/PWG1/macros/AddTaskAlignmentDataFilterITS.C
+$ALICE_ROOT/PWG1/macros/AddTaskV0QA.C
+$ALICE_ROOT/PWG1/macros/AddTaskPerformanceTPC.C
+$ALICE_ROOT/PWG1/macros/AddTaskVertexESD.C
+$ALICE_ROOT/PWG1/macros/AddTaskMTRchamberEfficiency.C
+$ALICE_ROOT/PWG1/macros/AddTaskPerformanceITS.C
+$ALICE_ROOT/PWG1/macros/AddTaskPerformanceTPCPtCalib.C
+$ALICE_ROOT/PWG1/macros/AddTaskGlobalQA.C
+$ALICE_ROOT/PWG1/macros/AddTaskIntSpotESD.C
+$ALICE_ROOT/PWG1/PilotTrain/AddTaskFMD.C
+$ALICE_ROOT/PWG1/PilotTrain/AddTaskVZEROQA.C
+$ALICE_ROOT/PWG1/PilotTrain/AddTaskPhysicsSelection.C
+$ALICE_ROOT/PWG1/PilotTrain/AddTaskSPDQA.C
+$ALICE_ROOT/PWG1/PilotTrain/AddTaskQAsym.C
+$ALICE_ROOT/PWG1/TPC/macros/AddTaskPerformanceTPCQA.C
+$ALICE_ROOT/PWG1/TPC/macros/AddTaskPerformanceTPC.C
+$ALICE_ROOT/PWG1/TRD/macros/AddTrainPerformanceTRD.C
+
+
+
+
+

diff --git a/PWG1/PWG1macros/MakeSDDPoints.C b/PWG1/PWG1macros/MakeSDDPoints.C
deleted file mode 100644 (file)
index f5b3c09..0000000
--- a/PWG1/PWG1macros/MakeSDDPoints.C
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-void MakeSDDPoints(){
-  gSystem->Load("libTree.so");
-  gSystem->Load("libGeom.so");
-  gSystem->Load("libVMC.so");
-  gSystem->Load("libPhysics");
-
-// Common packages
-  gSystem->Load("libSTEERBase.so");
-  gSystem->Load("libESD.so");
-  gSystem->Load("libAOD.so");
-  gSystem->Load("libANALYSIS.so");
-  gSystem->Load("libANALYSISalice.so");
-
-  TChain *esdChain = new TChain("esdTree");
-  esdChain->AddFile("/home/prino/alice/FirstPP/104044/09000104044018.10/AliESDs.root");
- 
-  AliAnalysisManager *mgr = new AliAnalysisManager("TestManager");
-  AliESDInputHandlerRP* esdH = new AliESDInputHandlerRP();
-  mgr->SetInputEventHandler(esdH);
-
-  gROOT->LoadMacro("AliAnalysisTaskSDDRP.cxx+g");
-  AliAnalysisTaskSDDRP *task= new AliAnalysisTaskSDDRP();
-  task->SetGeometryFile("/home/prino/alice/FirstPP/chunk1/geometry.root");
-  task->SetRunNumber(104044);
-  mgr->AddTask(task);
-  mgr->SetDebugLevel(2);
-
-
-  AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer();
-  AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("coutputRP",TList::Class(),AliAnalysisManager::kOutputContainer,"/home/prino/alice/test/SDDPoints.root");
-
-
-
-  mgr->ConnectInput(task,0,cinput1);
-  mgr->ConnectOutput(task,0,coutput1);
-
-
-  if (mgr->InitAnalysis()) {
-    mgr->PrintStatus();
-    mgr->StartAnalysis("local", esdChain);
-  }   
-  delete mgr;
-}   
-
-
-

diff --git a/PWG1/PWG1macros/README.Train b/PWG1/PWG1macros/README.Train
index 391121e764cc05f44fa6c68087a62d9c23452aba..3a2620d79883497055b8e070896c420df63b33a6 100644 (file)
--- a/PWG1/PWG1macros/README.Train
+++ b/PWG1/PWG1macros/README.Train
@@ -1,10 +1,11 @@
 Macros and scripts to run PWG1 train in $ALICE_ROOT/PWG1/PWG1macros
 
 runPWG1Train.C  - Steerring macro
-                - Load configuration for all tasks Add<PWG1>*.C
+                - Load configuration for all tasks from file  ConfigTask.txt 
                 - macro does not configure tasks - default arguments has to be provided
                 - run Analysis
 
+ConfigTask.txt  - 
 Add<PWG1>*.C    - Macros to configure user tasks
                 - All macros should have default parameters - otherwise they are ignored
                 - Task can get run number information, trigger information during analysis from ESDs
@@ -14,8 +15,8 @@ Add<PWG1>*.C    - Macros to configure user tasks
 
 
 
-User can commit to $ALICE_ROOT/PWG1/PWG1macros once fullfill previous criteria.
-But, not all of the macros will be used for production.
+User can commit to $ALICE_ROOT/PWG1/PWG1macros/ConfigTask.txt once fullfill previous criteria.
+Not all of the macros will be used for production.
 Only certified macros will be coppied to the production directory.
 
 Test are performed per macro Add*.C with given input esd.list.
@@ -40,10 +41,12 @@ getCertificate.sh    - User script to test task
 
 makeSummary.sh       - Make summary information
 
-getCertificateAll.sh - Pseudo code for train administrator
-                     - 1. Submit jobs for all user macros Add*.C
-                     - 2. Wait
-                     - 4. Make summary log files
-                     - Not implemented part
-                     - 3. Copy certified Add*.C to certified directory 
-                     - 5. Write e-amil  
\ No newline at end of file
+getCertificateBatch.sh - Pseudo code for train administrator - to be run bach farm
+getCertificateBuild.sh - similar code to be run on nightly build system
+                       //     
+                       - 1. Submit jobs for all user macros Add*.C
+                       - 2. Wait
+                       - 4. Make summary log files
+                       - Not implemented part
+                       - 3. Copy certified Add*.C to certified directory       
+                       - 5. Write e-amil  
\ No newline at end of file

diff --git a/PWG1/PWG1macros/getCertificateAll.sh b/PWG1/PWG1macros/getCertificateBatch.sh
similarity index 76%
rename from PWG1/PWG1macros/getCertificateAll.sh
rename to PWG1/PWG1macros/getCertificateBatch.sh
index d193da1ed9d54b7da340c6efb69a4fab7861e483..bcb9540d49303e1ff1ba6bd41a410f20f2a033ea 100644 (file)
--- a/PWG1/PWG1macros/getCertificateAll.sh
+++ b/PWG1/PWG1macros/getCertificateBatch.sh
@@ -1,5 +1,6 @@
-# Pseudo code to test the all components in the train and make report
-
+#
+# Pseudo code to test the all components in the train and make report on batch farm
+#
 
 #
 # 1. copy all task ans shell scirpts
@@ -12,13 +13,17 @@ cp /u/miranov/AliRoot/trunk/PWG1/PWG1macros/*.* .
 #
 bqueue=alice-t3_8h
 workdir=`pwd`
-for amacro in `ls  Add*.C`; do
-    mkdirhier $workdir/test$amacro
-    cd $workdir/test$amacro
-    cp $workdir/$amacro .
+rm -rf test*
+for fmacro in `cat ConfigTask.txt`; do
+    amacro=`basename $fmacro`
+    dname=`echo $workdir/test$amacro | sed s_.C__`
+    mkdirhier $dname
+    cd $dname
+    #
     cp $workdir/runPWG1Train.C .
     cp $workdir/*.sh  .
     cp $workdir/esd.list .
+    cp $workdir/ConfigTask.txt .
     echo bsub -q $bqueue getCertificate.sh $amacro
     bsub -q $bqueue getCertificate.sh $amacro esd.list
     cd $workdir

diff --git a/PWG1/PWG1macros/runPWG1Train.C b/PWG1/PWG1macros/runPWG1Train.C
index 54b7211f93f72dd914039549cd6232f5fcadebf4..05a9b138b8aedb1fea1840f882df5fc693d318e7 100644 (file)
--- a/PWG1/PWG1macros/runPWG1Train.C
+++ b/PWG1/PWG1macros/runPWG1Train.C
@@ -7,6 +7,10 @@
   //            tasks are expected to be in the working  directory
   //    fname : name of the input file or input list
 
+
+  .L $ALICE_ROOT/PWG1/PWG1macros/runPWG1Train.C
+
+
 */
 
 void LoadTrainLibs(){
@@ -30,6 +34,10 @@ void LoadTrainLibs(){
   gSystem->Load("libPWG4PartCorrDep.so");
 }
 
+void TestConfig(){
+
+}
+
 void AddMacros(const char *addmacros){
   //
   // add tasks from selected macros - * convention can be used
@@ -37,7 +45,7 @@ void AddMacros(const char *addmacros){
   // Macros has to be without arguments
   //
   //
-  TString  macroList = gSystem->GetFromPipe(Form("ls %s",addmacros));  
+  TString  macroList = gSystem->GetFromPipe(Form("cat ConfigTask.txt |grep  %s",addmacros));  
   TObjArray * array  = macroList.Tokenize("\n");
 
   if (!array) { printf("No task specified"); return;}