- Change from coordinates theta, phi to general coordinates Coor1 and Coor2.

- Lego generator instance can be passed in constructor.

diff --git a/STEER/AliLego.cxx b/STEER/AliLego.cxx
index 69bae9843ec88e5c930124be44214f55f9ac092d..530f325a916a6cde5c4b1b02f80724308aace549 100644 (file)
--- a/STEER/AliLego.cxx
+++ b/STEER/AliLego.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.18  2000/10/02 21:28:14  fca
+Removal of useless dependecies via forward declarations
+
 Revision 1.17  2000/07/12 08:56:25  fca
 Coding convention correction and warning removal
 
@@ -106,31 +109,47 @@ AliLego::AliLego()
 }
 
 //___________________________________________
-AliLego::AliLego(const char *title, Int_t ntheta, Float_t themin, 
-                Float_t themax, Int_t nphi, Float_t phimin, Float_t phimax,
+AliLego::AliLego(const char *title, Int_t ntheta, Float_t thetamin, 
+                Float_t thetamax, Int_t nphi, Float_t phimin, Float_t phimax,
                 Float_t rmin, Float_t rmax, Float_t zmax)
   : TNamed("Lego Generator",title)
 {
   //
   // specify the angular limits and the size of the rectangular box
   //
-   fGener = new AliLegoGenerator(ntheta, themin, themax,
+   fGener = new AliLegoGenerator(ntheta, thetamin, thetamax,
                       nphi, phimin, phimax, rmin, rmax, zmax);
    
-   gAlice->ResetGenerator(fGener);
-
-   Float_t etamin = -TMath::Log(TMath::Tan(TMath::Min((Double_t)themax*kDegrad/2,TMath::Pi()/2-1.e-10)));
-   Float_t etamax = -TMath::Log(TMath::Tan(TMath::Max((Double_t)themin*kDegrad/2,              1.e-10)));
 
+   
    fHistRadl = new TH2F("hradl","Radiation length map",    
-                       nphi,phimin,phimax,ntheta,themin,themax);
+                       ntheta,thetamin,thetamax,nphi,phimin,phimax);
    fHistAbso = new TH2F("habso","Interaction length map",  
-                       nphi,phimin,phimax,ntheta,themin,themax);
+                       ntheta,thetamin,thetamax,nphi,phimin,phimax);
    fHistGcm2 = new TH2F("hgcm2","g/cm2 length map",        
-                       nphi,phimin,phimax,ntheta,themin,themax);
-   fHistReta = new TH2F("hetar","Radiation length vs. eta",
-                       nphi,phimin,phimax,ntheta,etamin,etamax);
+                       ntheta,thetamin,thetamax,nphi,phimin,phimax);
+}
+
+AliLego::AliLego(const char *title, AliLegoGenerator* generator)
+  : TNamed("Lego Generator",title)
+{
+  //
+  // specify the angular limits and the size of the rectangular box
+  //
+   fGener = generator;
+   Float_t c1min, c1max, c2min, c2max;
+   Int_t n1 = fGener->NCoor1();
+   Int_t n2 = fGener->NCoor2();
+   
+   fGener->Coor1Range(c1min, c1max);
+   fGener->Coor2Range(c2min, c2max);   
 
+   fHistRadl = new TH2F("hradl","Radiation length map",    
+                       n1, c1min, c1max, n2, c2min, c2max);
+   fHistAbso = new TH2F("habso","Interaction length map",  
+                       n1, c1min, c1max, n2, c2min, c2max);
+   fHistGcm2 = new TH2F("hgcm2","g/cm2 length map",        
+                       n1, c1min, c1max, n2, c2min, c2max);
 }
 
 //___________________________________________
@@ -142,8 +161,6 @@ AliLego::~AliLego()
   delete fHistRadl;
   delete fHistAbso;
   delete fHistGcm2;
-  delete fHistReta;
-  gAlice->ResetGenerator(0);
   delete fGener;
 }
 
@@ -164,17 +181,12 @@ void AliLego::FinishEvent()
   //
   // Finish the event and update the histos
   //
-  Double_t thed, phid, eta;
-  thed = fGener->CurTheta()*kRaddeg;
-  phid = fGener->CurPhi()*kRaddeg;
-  eta  = -TMath::Log(TMath::Tan(TMath::Max(
-            TMath::Min((Double_t)(fGener->CurTheta())/2,
-                       TMath::Pi()/2-1.e-10),1.e-10)));
-
-  fHistRadl->Fill(phid,thed,fTotRadl);
-  fHistAbso->Fill(phid,thed,fTotAbso);
-  fHistGcm2->Fill(phid,thed,fTotGcm2);
-  fHistReta->Fill(phid,eta,fTotRadl);
+  Double_t c1, c2;
+  c1 = fGener->CurCoor1();
+  c2 = fGener->CurCoor2();
+  fHistRadl->Fill(c1,c2,fTotRadl);
+  fHistAbso->Fill(c1,c2,fTotAbso);
+  fHistGcm2->Fill(c1,c2,fTotGcm2);
 }
 
 //___________________________________________
@@ -186,14 +198,11 @@ void AliLego::FinishRun()
   fHistRadl->Write();
   fHistAbso->Write();
   fHistGcm2->Write();
-  fHistReta->Write();
 
   // Delete histograms from memory
   fHistRadl->Delete(); fHistRadl=0;
   fHistAbso->Delete(); fHistAbso=0;
   fHistGcm2->Delete(); fHistGcm2=0;
-  fHistReta->Delete(); fHistReta=0;
-
 }
 
 //___________________________________________
@@ -234,6 +243,12 @@ void AliLego::StepManager()
        fTotAbso += t/absl;
        fTotRadl += t/radl;
        fTotGcm2 += t*dens;
+//       Int_t copy;
+//       Int_t id = gMC->CurrentVolID(copy);
+//       char* vol = gMC->VolName(id);
+       
+//       printf("\n %f %f %f %f %s  ", fTotRadl, vect[0], vect[1], vect[2], vol);
+
      }
      gMC->StopTrack();
      return;
@@ -251,6 +266,14 @@ void AliLego::StepManager()
      fTotAbso += step/absl;
      fTotRadl += step/radl;
      fTotGcm2 += step*dens;
+//     Int_t copy;
+//     Int_t id = gMC->CurrentVolID(copy);
+//     char* vol = gMC->VolName(id);
+//     printf("\n %f %f %f %f %s %f ", fTotRadl, vect[0], vect[1], vect[2], vol, t);
    }
 }
 
+
+
+
+

diff --git a/STEER/AliLego.h b/STEER/AliLego.h
index ca23ae9c8f3edbdb0bf3a5c56dcb00982063a7c5..46adc7a4b7eac957b44a2d6dcc5eba4bd129186a 100644 (file)
--- a/STEER/AliLego.h
+++ b/STEER/AliLego.h
@@ -25,6 +25,7 @@ public:
   AliLego(const char *title, Int_t ntheta,Float_t themin,
          Float_t themax, Int_t nphi, Float_t phimin,
          Float_t phimax,Float_t rmin,Float_t rmax,Float_t zmax);
+  AliLego(const char *title, AliLegoGenerator* generator);
   AliLego(const AliLego &lego) {lego.Copy(*this);}
   virtual ~AliLego();
   void  Copy(AliLego &lego) const;
@@ -36,14 +37,14 @@ public:
   {lego.Copy(*this);return(*this);}
   
 private:
-  AliLegoGenerator *fGener;     //Lego generator
-   Float_t    fTotRadl;         //Total Radiation length
-   Float_t    fTotAbso;         //Total absorption length
-   Float_t    fTotGcm2;         //Total G/CM2 traversed
-   TH2F      *fHistRadl;        //Radiation length map 
-   TH2F      *fHistAbso;        //Interaction length map
-   TH2F      *fHistGcm2;        //g/cm2 length map
-   TH2F      *fHistReta;        //Radiation length map as a function of eta
+   AliLegoGenerator *fGener;     //Lego generator
+   Float_t    fTotRadl;          //Total Radiation length
+   Float_t    fTotAbso;          //Total absorption length
+   Float_t    fTotGcm2;          //Total G/CM2 traversed
+   TH2F      *fHistRadl;         //Radiation length map 
+   TH2F      *fHistAbso;         //Interaction length map
+   TH2F      *fHistGcm2;         //g/cm2 length map
+   TH2F      *fHistReta;         //Radiation length map as a function of eta
    
   ClassDef(AliLego,1) //Utility class to compute and draw Radiation Length Map