technical fixes
authorshahoian <ruben.shahoyan@cern.ch>
Thu, 10 Apr 2014 08:53:53 +0000 (10:53 +0200)
committerhristov <Peter.Hristov@cern.ch>
Thu, 29 May 2014 14:36:00 +0000 (16:36 +0200)
.rootrc [new file with mode: 0644]
ITS/UPGRADE/AliITSUSimulation.cxx
ITS/UPGRADE/Detector.cxx
ITS/UPGRADE/DetectorK.cxx
ITS/UPGRADE/KMCDetector.cxx
ITS/UPGRADE/v0/AliITSUpgradeReconstructor.cxx
test/ppbench/aod.C [new file with mode: 0644]
test/ppbench/recraw/aod.C [new file with mode: 0644]
test/ppbench/recraw/rec.C [new file with mode: 0644]
test/ppbench/sim.C

diff --git a/.rootrc b/.rootrc
new file mode 100644 (file)
index 0000000..e09119d
--- /dev/null
+++ b/.rootrc
@@ -0,0 +1,95 @@
+
+# ROOT Environment settings are handled via the class TEnv. To see
+# which values are active do: gEnv->Print().
+
+# Temporary change to avoid thrashing
+XNet.ReadCacheSize: 40000000
+XNet.ReadAheadSize: 1000000
+
+# Path used by dynamic loader to find shared libraries and macros
+# Paths are different for Unix and Windows. The example shows the defaults
+# for all ROOT applications for either Unix or Windows.
+Unix.*.Root.DynamicPath:    .:$(ROOTSYS)/lib:$(LD_LIBRARY_PATH)
+Unix.*.Root.MacroPath:      .:$(ROOTSYS)/macros:$(ALICE_ROOT)/macros
+WinNT.*.Root.DynamicPath:   ./;$(ROOTSYS);$(ROOTSYS)/bin;$(PATH)
+WinNT.*.Root.MacroPath:     ./;$(ROOTSYS)/macros
+
+# Fix include path for aclic
+ACLiC.IncludePaths:            -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)
+
+# Path where to look for TrueType fonts
+#Unix.*.Root.UseTTFonts:     true
+#Unix.*.Root.TTFontPath:     $(ROOTSYS)/ttf/fonts
+
+# Show where item is found in the specified path
+Root.ShowPath:           false
+
+# Activate memory statistics (size and cnt is used to trap allocation of
+# blocks of a certain size after cnt times)
+Root.MemStat:            0
+Root.MemStat.size:      -1
+Root.MemStat.cnt:       -1
+Root.ObjectStat:         0
+
+# Global debug mode. When >0 turns on progressively more details debugging.
+# When >4 X11 runs in synchronous mode.
+#Root.Debug:              0
+
+# Default editor
+Unix.*.Editor:           emacs
+WinNT.*.Editor:          notepad
+
+# TCanvas specific settings. Opaque move and resize show full pad during
+# the operation instead of only the outline. Especially for resize you'll
+# need serious CPU power. UseScreenFactor=true means to size canvas according
+# to size of screen, so a canvas still looks good on a low resolution
+# laptop screen without having to change canvas size in macros.
+# HighLightColor 2 = red. ShowEventStatus allows the event status bar to
+# be turned on by default.
+Canvas.MoveOpaque:          false
+Canvas.ResizeOpaque:        false
+Canvas.UseScreenFactor:     true
+Canvas.HighLightColor:      2
+Canvas.ShowEventStatus:     false
+
+# THtml specific settings.
+#Root.Html.OutputDir:         html/
+#Unix.*.Root.Html.SourceDir:  ./:src/
+#WinNT.*.Root.Html.SourceDir: ./
+#Root.Html.Author:           //*-- Author :
+#Root.Html.Author:           Fons Rademakers
+#Root.Html.Copyright:        * Copyright
+#Root.Html.LastUpdate:       //*CMZ :
+#Root.Html.Description:      //____________________
+#Root.Html.Root:             http://root.cern.ch/root/html
+#Root.Html.SearchEngine:     ../Search.phtml
+
+# GUI specific settings
+#Gui.NormalFont:        -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-iso8859-1
+#Gui.BoldFont:          -adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-iso8859-1
+#Gui.SmallFont:         -adobe-helvetica-medium-r-*-*-10-*-*-*-*-*-iso8859-1
+#Gui.ProportionalFont:  -adobe-courier-medium-r-*-*-12-*-*-*-*-*-iso8859-1
+#Gui.BackgroundColor:        #c0c0c0
+#Gui.ForegroundColor:        black
+#Gui.SelectForegroundColor:  white
+#Gui.SelectBackgroundColor:  #000080
+#Gui.IconPath:               $(HOME)/icons:$(ROOTSYS)/icons:.
+#Gui.MimeTypeFile:           $(HOME)/.root.mimes
+# If above does not exists defaults to this:
+#Gui.MimeTypeFile:           $ROOTSYS/icons/root.mimes
+# Can be either small, big, list, details
+Browser.IconStyle:          small
+# Can be either name, type, size, date
+Browser.SortBy:             name
+
+# Rint (interactive ROOT executable) specific alias, logon and logoff macros
+Rint.Load:               rootalias.C
+Rint.Logon:              rootlogon.C
+Rint.Logoff:             rootlogoff.C
+Rint.History:            $(HOME)/.root_hist
+
+# Example of custom setting for the Rint application (root.exe).
+# This overrides the default specified above for a generic application.
+# Color 5 is yellow.
+Rint.Canvas.HighLightColor:      5
+
index 9f70c73..d9bc1ae 100644 (file)
@@ -144,7 +144,6 @@ void AliITSUSimulation::UpdateMapSignal(UInt_t col,UInt_t row,Int_t trk,Int_t ht
     AliError(Form("CycleID %d is outside of allowed +-%d range",roCycle,kMaxROCycleAccept));
     return;
   }
-  //  AliInfo(Form("Col:%4d Row:%4d Trk:%4d Hit:%4d Sg:%.4f ROC: %d",col,row,trk,ht,signal,roCycle));
   UInt_t ind = fSensMap->GetIndex(col,row,roCycle);
   AliITSUSDigit* oldItem = (AliITSUSDigit*)fSensMap->GetItem(ind);  
   if (!oldItem) {    
index 4e9e856..e2828b0 100644 (file)
@@ -1542,12 +1542,12 @@ void Detector::MakeAliceCurrent(Int_t AlignResiduals, Bool_t flagTPC) {
     
   } else if (AlignResiduals==2) {
     
-    // tracking errors ... PLUS ... chip misalignment
+    // tracking errors ... PLUS ... module misalignment
     
     // itsRecoParam->SetClusterMisalErrorYBOn(0.0010,0.0030,0.0500,0.0500,0.0020,0.0020);  // [cm]
     // itsRecoParam->SetClusterMisalErrorZBOn(0.0050,0.0050,0.0050,0.0050,0.1000,0.1000);
     
-    //  the ITS chips are misalignment with small gaussian smearings with
+    //  the ITS modules are misalignment with small gaussian smearings with
     //  sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD
     
     AddLayer((char*)"spd1", 3.9, 0.0114, TMath::Sqrt(0.0012*0.0012+0.0010*0.0010+0.0008*0.0008), 
@@ -1565,7 +1565,7 @@ void Detector::MakeAliceCurrent(Int_t AlignResiduals, Bool_t flagTPC) {
 
   } else {
       
-      //  the ITS chips are misalignment with small gaussian smearings with
+      //  the ITS modules are misalignment with small gaussian smearings with
       //  sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD
       //  unknown in Z ????
 
index b0868c0..a52c2b1 100644 (file)
@@ -1844,12 +1844,12 @@ void DetectorK::MakeAliceCurrent(Int_t AlignResiduals, Bool_t flagTPC) {
     
   } else if (AlignResiduals==2) {
     
-    // tracking errors ... PLUS ... chip misalignment
+    // tracking errors ... PLUS ... module misalignment
     
     // itsRecoParam->SetClusterMisalErrorYBOn(0.0010,0.0030,0.0500,0.0500,0.0020,0.0020);  // [cm]
     // itsRecoParam->SetClusterMisalErrorZBOn(0.0050,0.0050,0.0050,0.0050,0.1000,0.1000);
     
-    //  the ITS chips are misalignment with small gaussian smearings with
+    //  the ITS modules are misalignment with small gaussian smearings with
     //  sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD
     
     AddLayer((char*)"spd1", 3.9, 0.0114, TMath::Sqrt(0.0012*0.0012+0.0010*0.0010+0.0008*0.0008), 
@@ -1867,7 +1867,7 @@ void DetectorK::MakeAliceCurrent(Int_t AlignResiduals, Bool_t flagTPC) {
 
   } else {
       
-      //  the ITS chips are misalignment with small gaussian smearings with
+      //  the ITS modules are misalignment with small gaussian smearings with
       //  sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD
       //  unknown in Z ????
 
index 22786ad..1c9ce09 100755 (executable)
@@ -1724,12 +1724,12 @@ void KMCDetector::MakeAliceCurrent(Bool_t flagTPC, Int_t AlignResiduals) {
   } else if (AlignResiduals==2) {
 
     
-    // tracking errors ... PLUS ... chip misalignment
+    // tracking errors ... PLUS ... module misalignment
     
     // itsRecoParam->SetClusterMisalErrorYBOn(0.0010,0.0030,0.0500,0.0500,0.0020,0.0020);  // [cm]
     // itsRecoParam->SetClusterMisalErrorZBOn(0.0050,0.0050,0.0050,0.0050,0.1000,0.1000);
     
-    //  the ITS chips are misalignment with small gaussian smearings with
+    //  the ITS modules are misalignment with small gaussian smearings with
     //  sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD
     
     AddLayer((char*)"spd1_its", 3.9, 0.0114, 2.48e-01, TMath::Sqrt(0.0012*0.0012+0.0010*0.0010+0.0008*0.0008), 
@@ -1747,7 +1747,7 @@ void KMCDetector::MakeAliceCurrent(Bool_t flagTPC, Int_t AlignResiduals) {
 
   } else {
       
-      //  the ITS chips are misalignment with small gaussian smearings with
+      //  the ITS modules are misalignment with small gaussian smearings with
       //  sigmarphi ~ 8, 10, 10 micron in SPD, SDD, SSD
       //  unknown in Z ????
 
index ecee868..859d857 100644 (file)
@@ -26,7 +26,7 @@
 #include "AliITSReconstructor.h"
 #include "AliITSupgrade.h"
 #include "AliITSUpgradeReconstructor.h" //class header
-#include "AliITSChipTypeRec.h"
+#include "AliITSDetTypeRec.h"
 #include "AliITS.h"              //Reconstruct() 
 #include "AliESDEvent.h"           //FillEsd()
 #include "AliRawReader.h"          //Reconstruct() for raw digits
diff --git a/test/ppbench/aod.C b/test/ppbench/aod.C
new file mode 100644 (file)
index 0000000..911379c
--- /dev/null
@@ -0,0 +1,13 @@
+void aod(){
+
+    gSystem->Load("libANALYSIS");
+    gSystem->Load("libANALYSISalice");
+    gSystem->Load("libCORRFW");
+    gSystem->Load("libPWGHFbase");
+    gSystem->Load("libPWGmuon");
+    gSystem->Load("libESDfilter");
+    gSystem->Load("libTENDER");
+    gSystem->Load("libPWGPP");
+
+    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
+}
diff --git a/test/ppbench/recraw/aod.C b/test/ppbench/recraw/aod.C
new file mode 100644 (file)
index 0000000..55bfd5f
--- /dev/null
@@ -0,0 +1,13 @@
+void aod(){
+
+    gSystem->Load("libANALYSIS");
+    gSystem->Load("libANALYSISalice");
+    gSystem->Load("libCORRFW");
+    gSystem->Load("libPWGHFbase");
+    gSystem->Load("libPWGmuon");
+    gSystem->Load("libESDfilter");
+    gSystem->Load("libTENDER");
+    gSystem->Load("libPWGPP");
+
+    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
+}
diff --git a/test/ppbench/recraw/rec.C b/test/ppbench/recraw/rec.C
new file mode 100644 (file)
index 0000000..285ef55
--- /dev/null
@@ -0,0 +1,32 @@
+void rec() {
+
+  AliReconstruction reco;
+
+  reco.SetWriteESDfriend();
+  reco.SetWriteAlignmentData();
+
+  reco.SetInput("raw.root");
+
+  reco.SetNumberOfEventsPerFile(-1); // all events in one single file
+
+  reco.SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  reco.SetSpecificStorage("GRP/GRP/Data",
+                         Form("local://%s/..",gSystem->pwd()));
+  reco.SetRunPlaneEff(kTRUE);
+
+  reco.SetRunReconstruction("ALL") ;
+  reco.SetRunQA("ALL:ALL") ;
+  
+  reco.SetQARefDefaultStorage("local://$ALICE_ROOT/QAref") ;
+  
+  for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
+    reco.SetQACycles((AliQAv1::DETECTORINDEX_t)det, 999) ;
+    reco.SetQAWriteExpert((AliQAv1::DETECTORINDEX_t)det) ; 
+  }
+
+  TStopwatch timer;
+  timer.Start();
+  reco.Run();
+  timer.Stop();
+  timer.Print();
+}
index 9d99aa4..baf8eeb 100644 (file)
@@ -1,4 +1,4 @@
-void sim(Int_t nev=3) {
+void sim(Int_t nev=20) {
 
   gSystem->Load("liblhapdf");
   gSystem->Load("libEGPythia6");
@@ -20,10 +20,6 @@ void sim(Int_t nev=3) {
   simulator.SetSpecificStorage("GRP/GRP/Data",
                               Form("local://%s",gSystem->pwd()));
   
-  simulator.SetSpecificStorage("ITS/Align/Data",
-                              Form("local://%s",gSystem->pwd()));
-
-
   simulator.SetRunQA("ALL:ALL") ; 
   
   simulator.SetQARefDefaultStorage("local://$ALICE_ROOT/QAref") ;