Small bug fixes to TPC files

diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx
index 67f385972d87dc4fec7ed7d6623964b00f8bb84a..bc2d6ba318b96efe9b536a7347036d82a892af17 100644 (file)
--- a/TPC/AliTPC.cxx
+++ b/TPC/AliTPC.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.18  2000/04/17 09:37:33  kowal2
+removed obsolete AliTPCDigitsDisplay.C
+
 Revision 1.17.2.2  2000/04/10 08:15:12  kowal2
 
 New, experimental data structure from M. Ivanov
@@ -118,6 +121,7 @@ AliTPC::AliTPC(const char *name, const char *title)
   //
   // Initialise arrays of hits and digits 
   fHits     = new TClonesArray("AliTPChit",  176);
+  gAlice->AddHitList(fHits);
   //MI change  
   fDigitsArray = 0;
   fClustersArray= 0;

diff --git a/macros/Config.C b/macros/Config.C
index 9f841cb0086a5abc2b0070c7e321a9f162997c95..b28dfc60bab231ac184c855a495d466456fd5f93 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -142,6 +142,7 @@ AliITS *ITS  = new AliITSv5("ITS","normal ITS");
 ITS->SetEUCLID(0);
 }
 
+
 if(iTPC) {
 //============================ TPC parameters ================================
 // --- This allows the user to specify sectors for the SLOW (TPC geometry 2)
@@ -159,40 +160,21 @@ if(iTPC) {
 //
 //-----------------------------------------------------------------------------
 
-AliTPC *TPC  = new AliTPCv1("TPC","Normal TPC");
-AliTPCD *paramd = TPC->GetDigParam();
-AliTPCParam *param = &(paramd->GetParam());
-
-// Set geometrical parameters
-
-param->SetSectorAngles(20.,10.,20.,10.);
-param->SetInnerRadiusLow(83.9);
-param->SetInnerRadiusUp(141.3);
-param->SetOuterRadiusLow(146.9);
-param->SetOuterRadiusUp(249.4);
-param->SetInSecLowEdge(81.6);
-param->SetInSecUpEdge(143.6);
-param->SetOuSecLowEdge(144.2);
-param->SetOuSecUpEdge(252.1);
-param->SetEdge(1.5);
-param->SetDeadZone(1.15);
-param->SetPadLength(2.0);
-param->SetPadWidth(0.3);
-param->SetPadPitchLength(2.05);
-param->SetPadPitchWidth(0.35);
-param->Update();
-
-if (TPC->IsVersion() != 2) paramd->Write("Param1");
+  gROOT->LoadMacro("SetTPCParam.C");
+  AliTPCParam *param = SetTPCParam();
+  AliTPC *TPC  = new AliTPCv1("TPC","Normal TPC"); //v1 is default
+  TPC->SetParam(param); // pass the parameter object to the TPC
 
 // set gas mixture
 
 TPC->SetGasMixt(2,20,10,-1,0.9,0.1,0.);
-TPC->SetSecAL(1);
-TPC->SetSecAU(1);
-// Meaningless with versions other than 2
-TPC->SetSecLows(1, 2, 3, 1+18, 2+18, 3+18);
-TPC->SetSecUps(1+36, 2+36, 3+36, 1+38+18, 2+38+18, 3+38+18, -1,-1,-1,-1,-1,-1);
+TPC->SetSecAL(4);
+TPC->SetSecAU(4);
+TPC->SetSecLows(1,  2,  3, 19, 20, 21);
+TPC->SetSecUps(37, 38, 39, 37+18, 38+18, 39+18, -1, -1, -1, -1, -1, -1);
 TPC->SetSens(1);
+
+if (TPC->IsVersion()==1) param->Write(param->GetTitle());
 }
 
 if(iTOF) {

diff --git a/macros/SetTPCParam.C b/macros/SetTPCParam.C
index 296363ccd5e6b937f3a40a8d71add7b43a4973ed..fd11a30b91019f4334ab061aea3c8529d2cd7b5d 100644 (file)
--- a/macros/SetTPCParam.C
+++ b/macros/SetTPCParam.C
@@ -1,5 +1,7 @@
 AliTPCParam * SetTPCParam()
 {
+  TDirectory *dirsave=gDirectory;
+
   AliTPCParamSR  * param = new AliTPCParamSR;
   AliTPCPRF2D    * prfinner   = new AliTPCPRF2D;
   AliTPCPRF2D    * prfouter   = new AliTPCPRF2D;
@@ -40,7 +42,7 @@ AliTPCParam * SetTPCParam()
   rf->SetOffset(3*param.GetZSigma());
   rf->Update();
   //Set two dimensional pad response function
-  TFile f("AliTPCprf2d.root");
+  TFile f("$ALICE_ROOT/TPC/AliTPCprf2d.root");
   prfinner->Read("prf_07504_Gati_056068_d02");
   prfouter->Read("prf_10006_Gati_047051_d03");
   param->SetInnerPRF(prfinner); //param object is responsible for destroying objects
@@ -49,5 +51,6 @@ AliTPCParam * SetTPCParam()
   f.Close();
   
   //gTPCParam =param;
+  dirsave->cd();
   return param;
 };