X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAlirootRun_MUONtestlong.sh;h=be1ddb937947ba40cccefaad1a4711a91821fa95;hb=0d66cd7dd3209041764a4e08827617c44c963f48;hp=b987bd610b89e217896e21d42ee9944ed647841f;hpb=10c8d1ce00f45a29923e4b9eee57884ce09485d8;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AlirootRun_MUONtestlong.sh b/MUON/AlirootRun_MUONtestlong.sh
index b987bd610b8..be1ddb93794 100755
--- a/MUON/AlirootRun_MUONtestlong.sh
+++ b/MUON/AlirootRun_MUONtestlong.sh
@@ -6,34 +6,14 @@ OUTDIR=testlong_out
 
 rm -fr $OUTDIR
 mkdir $OUTDIR
-cp .rootrc rootlogon.C $OUTDIR
+cp $ALICE_ROOT/MUON/.rootrc $ALICE_ROOT/MUON/rootlogon.C $OUTDIR
 cd $OUTDIR
 
-FULLPATH="$CURDIR/$OUTDIR"
 # Minimum number of events to have enough stat. for invariant mass fit
 # 10000 is ok, 20000 is really fine
 NEVENTS=10000
 SEED=1234567
 
-CDBDIRECTORY="$ALICE_ROOT/MUON/CDB/Default";
-CDB="local://$CDBDIRECTORY";
-
-if [ ! -d $CDBDIRECTORY"/MUON" ]; then
-
-echo "Generating Condition Database in directory $CDBDIRECTORY. This may take a while, so please be patient..."
-
-aliroot -b >& testGenerateCalibrations.out << EOF
-.L $ALICE_ROOT/MUON/MUONCDB.C+
-gRandom->SetSeed($SEED);
-generateCalibrations("$CDB",true);
-.q
-EOF
-
-else
-
-echo "Condition Database found in directory $CDBDIRECTORY. Will use it if needed."
-
-fi
 
 echo "Running simulation  ..."
 
@@ -41,11 +21,10 @@ aliroot -b >& testSim.out << EOF
 // Uncoment following lines to run simulation with local residual mis-alignment
 // (generated via MUONGenerateGeometryData.C macro)
 // AliCDBManager* man = AliCDBManager::Instance();
-// man->SetDefaultStorage("local://$ALICE_ROOT");
-// man->SetSpecificStorage("MUON","local://$ALICE_ROOT/MUON/ResMisAlignCDB");
-gRandom->SetSeed($SEED);
-AliCDBManager::Instance()->SetDefaultStorage("$CDB");
+// man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+// man->SetSpecificStorage("MUON/Align/Data","local://$ALICE_ROOT/OCDB/MUON/ResMisAlignCDB");
 AliSimulation MuonSim("$ALICE_ROOT/MUON/Config.C");
+MuonSim.SetSeed($SEED);
 MuonSim.SetMakeTrigger("MUON");
 MuonSim.Run($NEVENTS); 
 .q
@@ -54,13 +33,17 @@ EOF
 echo "Running reconstruction  ..."
 
 aliroot -b >& testReco.out << EOF 
+man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
 gRandom->SetSeed($SEED);
-AliCDBManager::Instance()->SetDefaultStorage("$CDB");
+AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 1, 1., 10., AliMagFMaps::k5kG);
+AliTracker::SetFieldMap(field, kFALSE);
 AliReconstruction MuonRec("galice.root"); 
-MuonRec.SetRunTracking("");
 MuonRec.SetRunVertexFinder(kFALSE);
 MuonRec.SetRunLocalReconstruction("MUON");
+MuonRec.SetRunTracking("MUON");
 MuonRec.SetFillESD("MUON");
+MuonRec.SetLoadAlignData("MUON");
+MuonRec.SetNumberOfEventsPerFile($NEVENTS);
 MuonRec.Run(); 
 .q
 EOF
@@ -69,7 +52,7 @@ echo "Running Trigger efficiency  ..."
 
 aliroot -b >& testTriggerResults.out << EOF
 .L $ALICE_ROOT/MUON/MUONTriggerEfficiency.C+
-MUONTriggerEfficiency();
+MUONTriggerEfficiency("galice.root", "galice.root",0);
 .q
 EOF
 
@@ -78,14 +61,15 @@ echo "Running efficiency  ..."
 aliroot -b >& testEfficiency.out << EOF 
 .L $ALICE_ROOT/MUON/MUONefficiency.C+
 // no argument assumes Upsilon but MUONefficiency(443) handles Jpsi
-MUONefficiency();
+MUONefficiency("galice.root");
 .q
 EOF
 
 
 aliroot -b >& testResults.out << EOF 
 // no argument assumes Upsilon but MUONplotefficiency(443) handles Jpsi
-.x $ALICE_ROOT/MUON/MUONplotefficiency.C
+.L $ALICE_ROOT/MUON/MUONplotefficiency.C+
+MUONplotefficiency();
 .q
 EOF
 
@@ -96,11 +80,11 @@ more  testSim.out | grep 'RunDigitization: Execution time:'  >> testTime.out
 more  testReco.out | grep 'RunLocalReconstruction: Execution time for MUON'  >> testTime.out
 more  testReco.out | grep 'Execution time for filling ESD ' >> testTime.out
 
-rm gphysi.dat
-rm *.root
-rm testSim.out
-rm testReco.out
-rm *.eps
+#rm gphysi.dat
+#rm *.root
+#rm testSim.out
+#rm testReco.out
+#rm *.eps
 
 echo "Finished"  
 echo "... see results in testlong_out"