X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=VZERO%2FAliVZEROv3.cxx;h=7330fa1b9a3d33d058ef2c24bd64f31923a3a795;hb=52832b7aab939d1de657b7f224f38c5bcf4a8a75;hp=1a3143cecc147aee14f7ba846439adfaf90f4aa7;hpb=254ef8f1abdc7d79cfa5c1ab66c6a5bbfd0d7f2f;p=u%2Fmrichter%2FAliRoot.git diff --git a/VZERO/AliVZEROv3.cxx b/VZERO/AliVZEROv3.cxx index 1a3143cecc1..7330fa1b9a3 100755 --- a/VZERO/AliVZEROv3.cxx +++ b/VZERO/AliVZEROv3.cxx @@ -39,15 +39,12 @@ // --- ROOT libraries --- #include -#include +#include #include #include -#include #include -#include -#include -#include #include +#include // --- AliRoot header files --- #include "AliConst.h" @@ -63,24 +60,38 @@ ClassImp(AliVZEROv3) //_____________________________________________________________________________ -AliVZEROv3:: AliVZEROv3():AliVZERO() +AliVZEROv3:: AliVZEROv3():AliVZERO(), + fCellId(0), + fTrackPosition(), + fTrackMomentum(), + fLightYield(93.75), + fLightAttenuation(0.05), + fnMeters(15.0), + fFibToPhot(0.3) { // Standard default constructor } //_____________________________________________________________________________ AliVZEROv3::AliVZEROv3(const char *name, const char *title): - AliVZERO(name,title) + AliVZERO(name,title), + fCellId(0), + fTrackPosition(), + fTrackMomentum(), + fLightYield(93.75), + fLightAttenuation(0.05), + fnMeters(15.0), + fFibToPhot(0.3) { // Standard constructor for V-zero Detector version 2 AliDebug(2,"Create VZERO object"); - fLightYield = 93.75; - fLightAttenuation = 0.05; - fnMeters = 15.0; - fFibToPhot = 0.3; +// fLightYield = 93.75; +// fLightAttenuation = 0.05; +// fnMeters = 15.0; +// fFibToPhot = 0.3; } @@ -301,304 +312,6 @@ void AliVZEROv3::CreateGeometry() } -//_____________________________________________________________________________ -void AliVZEROv3::BuildGeometry() -{ - -// Builds simple ROOT TNode geometry for event display - - AliDebug(2,"VZERO BuildGeometry"); - - TNode *top; - - TNode *v0Rnode, *v0Rnode0, *v0Rnode6 , *v0Rnode7, *v0Rnode8, *v0Rnode9; - TNode *v0Rnode1, *v0Rnode2, *v0Rnode3; - TNode *v0Lnode, *v0Lnode0; - TNode *v0Lnode1, *v0Lnode2, *v0Lnode3; - - const int kColorVZERO = kGreen; - - top = gAlice->GetGeometry()->GetNode("alice"); - - Float_t height1Right, height2Right, height3Right; - Float_t heightRight; - Float_t theta; - - Float_t halfThickQua; - Float_t zdet; - Float_t r0Right, r3Right; - Float_t pi = TMath::Pi(); - - height1Right = 1.82 + 3.81; // height of cell 1, in cm - height2Right = 4.72 + 7.12; // height of cell 2, in cm - height3Right = 10.83; // height of cell 3, in cm - - theta = pi/6.0/2.0; - - halfThickQua = fThickness1/2.0; - - zdet = 90.0 - 0.6 - fThickness/2.0; - r0Right = 4.05; - heightRight = height1Right + height2Right + height3Right; - r3Right = r0Right + heightRight; - - Int_t ndiv = 1; - - Float_t partube[3]; - - partube[0] = r0Right - 0.2; - partube[1] = r3Right + 1.0; - partube[2] = fThickness/2.0; - - TTUBE *v0RI = new TTUBE("V0RI", "V0RI", "void", partube[0], partube[1], partube[2]); - - top->cd(); - - v0Rnode = new TNode("V0RI","V0RI",v0RI,0.0,0.0,-zdet,0); - - v0Rnode->SetLineColor(kYellow); - fNodes->Add(v0Rnode); - v0Rnode->SetVisibility(2); - -// Rondelles de carbone (epaisseur 3.5 mm) de maintien des cellules ... - - Float_t lidThickness = 0.35; - - partube[0] = r0Right; - partube[1] = r3Right; - partube[2] = +lidThickness/2.0; - - TTUBE *v0CA = new TTUBE("V0CA", "V0CA", "void",partube[0], partube[1], partube[2]); - - v0Rnode->cd(); - v0Rnode6 = new TNode("V0CA", "V0CA",v0CA,0.0,0.0, fThickness/2.0-partube[2],0); - v0Rnode6->SetLineColor(kYellow); - fNodes->Add(v0Rnode6); - v0Rnode->cd(); - v0Rnode7 = new TNode("V0CA", "V0CA",v0CA,0.0,0.0,-fThickness/2.0+partube[2],0); - v0Rnode7->SetLineColor(kYellow); - fNodes->Add(v0Rnode7); - - partube[0] = r0Right - 0.2; - partube[1] = r0Right; - partube[2] = +fThickness/2.0; - - TTUBE *v0IR = new TTUBE("V0IR","V0IR","void", partube[0], partube[1], partube[2]); - - v0Rnode->cd(); - v0Rnode8 = new TNode("V0IR", "V0IR",v0IR,0.0,0.0,0.0,0); - v0Rnode8->SetLineColor(kYellow); - fNodes->Add(v0Rnode8); - - partube[0] = r3Right; - partube[1] = r3Right + 1.0; - partube[2] = +fThickness/2.0; - - TTUBE *v0ER = new TTUBE("V0ER","V0ER","void", partube[0], partube[1], partube[2]); - - v0Rnode->cd(); - v0Rnode9 = new TNode("V0ER", "V0ER",v0ER,0.0,0.0,0.0,0); - v0Rnode9->SetLineColor(kYellow); - fNodes->Add(v0Rnode9); - - Float_t partubs[5]; - - partubs[0] = r0Right; - partubs[1] = r3Right; - partubs[2] = fThickness/2.0; - partubs[3] = 90.0-15.0; - partubs[4] = 120.0-15.0; - - TTUBS *v0R0 = new TTUBS("V0R0", "V0R0", "void",partubs[0], partubs[1], partubs[2], - partubs[3], partubs[4]); - - v0R0->SetNumberOfDivisions(ndiv); - - Float_t r1Right = r0Right + height1Right; - Float_t offset = fThickness/2.0 - lidThickness - fThickness1/2.0; - Float_t offsetFibers = 1.7; - - partubs[0] = r0Right; - partubs[1] = r1Right; - partubs[2] = fThickness1/2.0; - - TTUBS *v0R1 = new TTUBS("V0R1", "V0R1", "void", partubs[0], partubs[1], partubs[2], - partubs[3], partubs[4]); - - v0R1->SetNumberOfDivisions(ndiv); - - Float_t r2Right = r1Right + height2Right; - - partubs[0] = r1Right; - partubs[1] = r2Right; - - TTUBS *v0R2 = new TTUBS("V0R2", "V0R2", "void", partubs[0], partubs[1], partubs[2], - partubs[3], partubs[4]); - - v0R2->SetNumberOfDivisions(ndiv); - - partubs[0] = r2Right; - partubs[1] = r3Right; - - TTUBS *v0R3 = new TTUBS("V0R3", "V0R3", "void", partubs[0], partubs[1], partubs[2], - partubs[3], partubs[4]); - v0R3->SetNumberOfDivisions(ndiv); - - Float_t phi; - Float_t phiDeg= 180./6.; - - Int_t ndetR = 1; - - char nameNode[12]; - - for (phi = 15.0; phi < 360.0; phi = phi + phiDeg) - - { - - TRotMatrix* mat920 = new TRotMatrix("rot920","rot920", 90.0, +phi, 90., 90.+phi, 0.0, 0.0 ); - - sprintf(nameNode,"SUBDER%d",ndetR); - - v0Rnode->cd(); - v0Rnode0 = new TNode(nameNode,nameNode,v0R0,0.0,0.0, 0.0,mat920); - v0Rnode0->SetLineColor(kYellow); - fNodes->Add(v0Rnode0); - ndetR++; - - sprintf(nameNode,"SUBDER%d",ndetR); - v0Rnode0->cd(); - v0Rnode1 = new TNode(nameNode,nameNode,v0R1,0.0,0.0, -offset+ offsetFibers ,0); - v0Rnode1->SetLineColor(kColorVZERO); - fNodes->Add(v0Rnode1); - ndetR++; - - sprintf(nameNode,"SUBDER%d",ndetR); - v0Rnode0->cd(); - v0Rnode2 = new TNode(nameNode,nameNode,v0R2,0.0,0.0, -offset,0); - v0Rnode2->SetLineColor(kColorVZERO); - fNodes->Add(v0Rnode2); - ndetR++; - - sprintf(nameNode,"SUBDER%d",ndetR); - v0Rnode0->cd(); - v0Rnode3 = new TNode(nameNode,nameNode,v0R3,0.0,0.0, -offset,0); - v0Rnode3->SetLineColor(kColorVZERO); - fNodes->Add(v0Rnode3); - ndetR++; - - v0Rnode0->SetVisibility(2); - - } - -// Left side of VZERO : - - Float_t r0Left = 4.3; - Float_t height1Left = 2.6 + 4.1; - Float_t height2Left = 6.4 + 10.2; - Float_t height3Left = 16.9; - Float_t heightLeft = height1Left + height2Left + height3Left; - - Float_t r3Left = r0Left + heightLeft; - - partube[0] = r0Left; - partube[1] = r3Left; - partube[2] = fThickness1/2.0; - - TTUBE *v0LE = new TTUBE("V0LE", "V0LE", "void", partube[0], partube[1], partube[2]); - - top->cd(); - - v0Lnode = new TNode("V0LE","V0LE",v0LE,0.0,0.0,350.0+fThickness1/2.0,0); - - v0Lnode->SetLineColor(kBlue); - fNodes->Add(v0Lnode); - - v0Lnode->SetVisibility(2); - - partubs[0] = r0Left; - partubs[1] = r3Left; - partubs[2] = fThickness1/2.0; - partubs[3] = 90.0-15.0; - partubs[4] = 120.0-15.0; - - TTUBS *v0L0 = new TTUBS("V0L0", "V0L0", "void", partubs[0], partubs[1], partubs[2], - partubs[3], partubs[4]); - - v0L0->SetNumberOfDivisions(ndiv); - v0L0->SetLineColor(7); - - Float_t offsetLeft; - offsetLeft = - fThickness1/2.0; - - Float_t r1Left = r0Left + height1Left; - - partubs[0] = r0Left; - partubs[1] = r1Left; - - TTUBS *v0L1 = new TTUBS("V0L1", "V0L1", "void", partubs[0], partubs[1], partubs[2], - partubs[3], partubs[4]); - v0L1->SetNumberOfDivisions(ndiv); - - Float_t r2Left = r1Left + height2Left; - - partubs[0] = r1Left; - partubs[1] = r2Left; - - TTUBS *v0L2 = new TTUBS("V0L2", "V0L2", "void", partubs[0], partubs[1], partubs[2], - partubs[3], partubs[4]); - v0L2->SetNumberOfDivisions(ndiv); - - partubs[0] = r2Left; - partubs[1] = r3Left; - - TTUBS *v0L3 = new TTUBS("V0L3", "V0L3", "void", partubs[0], partubs[1], partubs[2], - partubs[3], partubs[4]); - v0L3->SetNumberOfDivisions(ndiv); - - Int_t ndetL = 1; - - for (phi = 15.0; phi < 360.0; phi = phi + phiDeg) - - { - - TRotMatrix* mat920 = new TRotMatrix("rot920","rot920", 90.0, +phi, 90., 90.+phi, 0.0, 0.0 ); - - - sprintf(nameNode,"SUBDEL%d",ndetL); - - v0Lnode->cd(); - v0Lnode0 = new TNode(nameNode,nameNode,v0L0,0.0,0.0, offsetLeft + halfThickQua,mat920); - v0Lnode0->SetLineColor(kColorVZERO); - fNodes->Add(v0Lnode0); - ndetL++; - - sprintf(nameNode,"SUBDEL%d",ndetL); - v0Lnode0->cd(); - v0Lnode1 = new TNode(nameNode,nameNode,v0L1,0.0,0.0, 0.0,0); - v0Lnode1->SetLineColor(kColorVZERO); - fNodes->Add(v0Lnode1); - ndetL++; - - sprintf(nameNode,"SUBDEL%d",ndetL); - v0Lnode0->cd(); - v0Lnode2 = new TNode(nameNode,nameNode,v0L2,0.0,0.0, 0.0,0); - v0Lnode2->SetLineColor(kColorVZERO); - fNodes->Add(v0Lnode2); - ndetL++; - - sprintf(nameNode,"SUBDEL%d",ndetL); - v0Lnode0->cd(); - v0Lnode3 = new TNode(nameNode,nameNode,v0L3,0.0,0.0, 0.0,0); - v0Lnode3->SetLineColor(kColorVZERO); - fNodes->Add(v0Lnode3); - ndetL++; - - v0Lnode0->SetVisibility(2); - - } - -} - //_____________________________________________________________________________ void AliVZEROv3::CreateMaterials() { @@ -684,10 +397,9 @@ void AliVZEROv3::CreateMaterials() AliMaterial( 5, "ALUMINIUM2$", aal, zal, densal, radlal, 0, 0, 0); AliMixture( 6, "Scintillator$",ascin,zscin,denscin,-2,wscin); - - - Int_t iSXFLD = gAlice->Field()->Integ(); - Float_t sXMGMX = gAlice->Field()->Max(); + + Int_t iSXFLD = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ(); // Field type + Float_t sXMGMX = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max(); // Field max. Float_t tmaxfd, stemax, deemax, epsil, stmin; @@ -941,8 +653,8 @@ void AliVZEROv3::MakeBranch(Option_t *option) const char *cH = strstr(option,"H"); - if (fHits && TreeH() && cH) { - TreeH()->Branch(branchname,&fHits, fBufferSize); + if (fHits && fLoader->TreeH() && cH) { + fLoader->TreeH()->Branch(branchname,&fHits, fBufferSize); AliDebug(2,Form("Making Branch %s for hits",branchname)); }