Changeset 100 in svn for trunk/src/FrogUtil.cc

Timestamp:

Dec 18, 2008, 2:39:26 PM (16 years ago)

Author:

severine ovyn

Message:

Remove datacard bug + CaloTowers OK

File:

• trunk/src/FrogUtil.cc (modified) (5 diffs)

trunk/src/FrogUtil.cc

@@ -485 +485 @@
   
   double Rayon_Tracker=50;
-  double Rayon_Calo = Rayon_Tracker*2;
-  double Lenght_Tracker=120;
-  double Lenght_Calo=Lenght_Tracker+Lenght_Tracker/2;
-  double Lenght_FWCalo=Lenght_Tracker+Lenght_Tracker;
-  
-  int NumPhi=10;
+  double Rayon_Calo = Rayon_Tracker*1.5;
+  double Rayon_Muon = Rayon_Tracker*2;
+  double Lenght_Tracker=100;
+  double Lenght_Calo=Lenght_Tracker+Lenght_Tracker/2.5;
+  double Lenght_Muon=Lenght_Calo+Lenght_Calo/2.5;
+  double Lenght_FWCalo=Lenght_Tracker+1.5*Lenght_Tracker;
+  
+  int plus=1;
+  int NumPhi=4;
   
   //************************************************Tracker*************************************************
@@ -498 +501 @@
   detector->addDaughter(Tracker);
   unsigned int DetIdCountTracker = 1;
-  for(double ray=0;ray <= Rayon_Tracker;ray +=5){
+  for(double ray=0;ray <= Rayon_Tracker;ray +=plus){
+  //  double ray=Rayon_Tracker;
     double length = ray/tan(EtaToTheta(DET->CEN_max_tracker));
     if(length >= Lenght_Tracker)
       {
-        FROG_Element_Primitive_Cylinder* tracker = new FROG_Element_Primitive_Cylinder(9100000+DetIdCountTracker*10,ray,0,0,0,0,0,Lenght_Tracker,NumPhi,0);
+        FROG_Element_Primitive_Cylinder* tracker = new FROG_Element_Primitive_Cylinder(9100000+DetIdCountTracker*10,ray,0,0,0,0,0,Lenght_Tracker,NumPhi,1);
+//      FROG_Element_Primitive_Cone* tracker = new FROG_Element_Primitive_Cone(9100000+DetIdCountTracker*10,ray,0,0,0,0,0,Lenght_Tracker,NumPhi,1);
         Tracker->addDaughter(tracker);   DetIdCountTracker++;
       }
@@ -518 +523 @@
   unsigned int DetIdCountCalo = 1;
   
-  for(double ray=Rayon_Tracker;ray <= Rayon_Calo ;ray +=5){
+  for(double ray=Rayon_Tracker;ray <= Rayon_Calo ;ray +=plus){
     double length = ray/tan(EtaToTheta(DET->CEN_max_calo_cen));
     double add;
@@ -529 +534 @@
       }
   }
-  for(double ray=0;ray <= Rayon_Tracker;ray +=5){
+  for(double ray=0;ray <= Rayon_Tracker;ray +=plus){
     double length = ray/tan(EtaToTheta(DET->CEN_max_calo_cen));
     double add;
@@ -552 +557 @@
   double eta_Max=DET->CEN_max_calo_fwd,eta_Min=DET->CEN_max_calo_cen;
   
-  for(double ray=0;ray <= 50;ray +=5){
+  for(double ray=0;ray <= 50;ray +=plus){
     double length = ray/tan(EtaToTheta(eta_Max));
     double add;
-    if(length >= Lenght_FWCalo)add=(Lenght_FWCalo-Lenght_Calo)/2;
-    else add=(length-Lenght_Calo)/2;
+    if(length >= Lenght_FWCalo)add=(Lenght_FWCalo-Lenght_Muon)/2;
+    else add=(length-Lenght_Muon)/2;
     
     if(add > 0 && ray < Lenght_FWCalo*tan(EtaToTheta(eta_Min)))
       {
-        FROG_Element_Primitive_Cylinder* caloFW1 = new FROG_Element_Primitive_Cylinder(9300000+DetIdCountFwCalo*10,ray,0,0,(Lenght_Calo+add)/2,0,0,add,NumPhi,0);
+        FROG_Element_Primitive_Cylinder* caloFW1 = new FROG_Element_Primitive_Cylinder(9300000+DetIdCountFwCalo*10,ray,0,0,(Lenght_Muon+add)/2,0,0,add,NumPhi,0);
         FWCALO->addDaughter(caloFW1);   DetIdCountFwCalo++;
-        FROG_Element_Primitive_Cylinder* caloFW2 = new FROG_Element_Primitive_Cylinder(9300000+DetIdCountFwCalo*10,ray,0,0,-(Lenght_Calo+add)/2,0,0,add,NumPhi,0);
+        FROG_Element_Primitive_Cylinder* caloFW2 = new FROG_Element_Primitive_Cylinder(9300000+DetIdCountFwCalo*10,ray,0,0,-(Lenght_Muon+add)/2,0,0,add,NumPhi,0);
         FWCALO->addDaughter(caloFW2);   DetIdCountFwCalo++;
       }
   }
+
+  //***********************************************Muon chambers********************************************
+  //********************************************************************************************************
+  //
+  FROG_Element_Base_With_DetId_And_Name* MUON = new FROG_Element_Base_With_DetId_And_Name(940000000,"MuonDet");
+  detector->addDaughter(MUON);
+  unsigned int DetIdCountMuon = 1;
+
+  for(double ray=Rayon_Calo;ray <= Rayon_Muon ;ray +=plus){
+    double length = ray/tan(EtaToTheta(DET->CEN_max_mu));
+    double add;
+    if(length >= Lenght_Muon)add=Lenght_Muon;
+    else add=ray/tan(EtaToTheta(DET->CEN_max_calo_cen));
+    if(add > 0)
+      {
+        FROG_Element_Primitive_Cylinder* muon = new FROG_Element_Primitive_Cylinder(9400000+DetIdCountMuon*10,ray,0,0,0,0,0,add,NumPhi,0);
+        MUON->addDaughter(muon);   DetIdCountMuon++;
+      }
+  }
+  for(double ray=0;ray <= Rayon_Calo;ray +=plus){
+    double length = ray/tan(EtaToTheta(DET->CEN_max_calo_cen));
+    double add;
+    if(length >= Lenght_Muon)add=(Lenght_Muon-Lenght_Calo)/2;
+    else add=(length-Lenght_Calo)/2;
+    if(add > 0)
+      {
+        FROG_Element_Primitive_Cylinder* muonP = new FROG_Element_Primitive_Cylinder(9400000+DetIdCountMuon*10,ray,0,0,(Lenght_Calo+add)/2,0,0,add,NumPhi,0);
+        MUON->addDaughter(muonP);   DetIdCountMuon++;
+        FROG_Element_Primitive_Cylinder* muonM = new FROG_Element_Primitive_Cylinder(9400000+DetIdCountMuon*10,ray,0,0,-(Lenght_Calo+add)/2,0,0,add,NumPhi,0);
+        MUON->addDaughter(muonM);   DetIdCountMuon++;
+      }
+  }
+
+  
     
   FROG_Geometry* CustomGeom = new FROG_Geometry(prim);