Reducing number of trigger volumes directly placed in ALIC, changing gas volume name...
authormartinez <martinez@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 7 Jun 2005 01:45:03 +0000 (01:45 +0000)
committermartinez <martinez@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 7 Jun 2005 01:45:03 +0000 (01:45 +0000)
MUON/AliMUONConstants.cxx
MUON/AliMUONTriggerGeometryBuilder.cxx
MUON/data/svmap_trigger.dat

index 369b801..a637c99 100644 (file)
@@ -48,7 +48,7 @@ Float_t  AliMUONConstants::fgPitchSt1  = 0.21;
 // ALICE / ALICE Engineering baseline / Dimuonspectrometer (DIS) v7-1
 // EDMS Id 335328 for "search in EDMS 
 // These are the diameter (innner and ounner) values of the active surface
-Float_t  AliMUONConstants::fgDmin[7]  = {   36.4,  46.2,  63.0,   79.0,   79.0,  100.0,  100.0};  
+Float_t  AliMUONConstants::fgDmin[7]  = {   36.4,  46.2,  63.0,   79.0,   79.0,  99.0,  100.0};  
 Float_t  AliMUONConstants::fgDmax[7]  = {  176.6, 229.0, 308.84, 418.2,  522.0, 1224.0, 1300.0}; 
  
 Int_t    AliMUONConstants::fgMaxZoom = 20;
index 72f7259..78c558a 100644 (file)
@@ -128,10 +128,15 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry()
     const Float_t kZm=-3.6;
     const Float_t kZp=+3.6;     
 
-    AliMUONChamber *iChamber, *iChamber1;
+    AliMUONChamber *iChamber, *iChamber1, *iChamber2;
     iChamber1 = &fMUON->Chamber(10);
     Float_t zpos1=-iChamber1->Z(); 
-    
+    iChamber2 = &fMUON->Chamber(11);
+
+    Double_t dstation =  ( (-iChamber2->Z()) - (-iChamber1->Z()) ) /2.1;
+    Float_t par[3];
+    par[2] = dstation;
+
 // ratio of zpos1m/zpos1p and inverse for first plane
     Float_t zmp=(zpos1-3.6)/(zpos1+3.6);
     Float_t zpm=1./zmp;
@@ -146,6 +151,13 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry()
                Int_t(istation*TMath::Power(2,1));
            
            iChamber = &fMUON->Chamber(10+icount);
+           par[0] = iChamber->RInner(); 
+           par[1] = iChamber->ROuter();
+           Char_t volName[6];
+           sprintf(volName,"%s%d", "CH",11+icount);
+           gMC->Gsvolu(volName,"TUBE", idAir, par, 3);
+           iChamber->GetGeometry()->SetVolume(volName);
+
            Float_t zpos = - iChamber->Z();          
            
 /* removed 03/18/05
@@ -191,7 +203,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry()
            char volGaz[5];     // Gas streamer     
            sprintf(volAlu,"SC%dA",icount+1);
            sprintf(volBak,"SB%dA",icount+1);
-           sprintf(volGaz,"SG%dA",icount+1);
+           sprintf(volGaz,"S%dG",icount+11);
            gMC->Gsvolu(volAlu,"BOX",idAlu1,tpar,0);         // Al
            gMC->Gsvolu(volBak,"BOX",idtmed[1107],tpar,0);   // Bakelite
            gMC->Gsvolu(volGaz,"BOX",idtmed[1106],tpar,0);   // Gas streamer
@@ -361,9 +373,9 @@ void AliMUONTriggerGeometryBuilder::SetSensitiveVolumes()
 // Defines the sensitive volumes for trigger station chambers.
 // ---
 
-  GetGeometry(10)->SetSensitiveVolume("SG1A");
-  GetGeometry(11)->SetSensitiveVolume("SG2A");
-  GetGeometry(12)->SetSensitiveVolume("SG3A");
-  GetGeometry(13)->SetSensitiveVolume("SG4A");
+  GetGeometry(10)->SetSensitiveVolume("S11G");
+  GetGeometry(11)->SetSensitiveVolume("S12G");
+  GetGeometry(12)->SetSensitiveVolume("S13G");
+  GetGeometry(13)->SetSensitiveVolume("S14G");
 }
 
index e8be9a5..af089fc 100644 (file)
@@ -1,92 +1,92 @@
-SV  /ALIC.1/SC1A.1/SB1A.1/SG1A.1   1104
-SV  /ALIC.1/SC1A.2/SB1A.1/SG1A.1   1154
-SV  /ALIC.1/SC1A.3/SB1A.1/SG1A.1   1103
-SV  /ALIC.1/SC1A.7/SB1A.1/SG1A.1   1103
-SV  /ALIC.1/SC1A.4/SB1A.1/SG1A.1   1105
-SV  /ALIC.1/SC1A.8/SB1A.1/SG1A.1   1105
-SV  /ALIC.1/SC1A.5/SB1A.1/SG1A.1   1153
-SV  /ALIC.1/SC1A.9/SB1A.1/SG1A.1   1153
-SV  /ALIC.1/SC1A.6/SB1A.1/SG1A.1   1155
-SV  /ALIC.1/SC1A.10/SB1A.1/SG1A.1   1155
-SV  /ALIC.1/SC1A.11/SB1A.1/SG1A.1   1102
-SV  /ALIC.1/SC1A.12/SB1A.1/SG1A.1   1106
-SV  /ALIC.1/SC1A.13/SB1A.1/SG1A.1   1152
-SV  /ALIC.1/SC1A.14/SB1A.1/SG1A.1   1156
-SV  /ALIC.1/SC1A.15/SB1A.1/SG1A.1   1101
-SV  /ALIC.1/SC1A.16/SB1A.1/SG1A.1   1107
-SV  /ALIC.1/SC1A.17/SB1A.1/SG1A.1   1151
-SV  /ALIC.1/SC1A.18/SB1A.1/SG1A.1   1157
-SV  /ALIC.1/SC1A.19/SB1A.1/SG1A.1   1100
-SV  /ALIC.1/SC1A.20/SB1A.1/SG1A.1   1108
-SV  /ALIC.1/SC1A.21/SB1A.1/SG1A.1   1150
-SV  /ALIC.1/SC1A.22/SB1A.1/SG1A.1   1158
+SV  /ALIC.1/CH11.1/SC1A.1/SB1A.1/S11G.1   1104
+SV  /ALIC.1/CH11.1/SC1A.2/SB1A.1/S11G.1   1154
+SV  /ALIC.1/CH11.1/SC1A.3/SB1A.1/S11G.1   1103
+SV  /ALIC.1/CH11.1/SC1A.7/SB1A.1/S11G.1   1103
+SV  /ALIC.1/CH11.1/SC1A.4/SB1A.1/S11G.1   1105
+SV  /ALIC.1/CH11.1/SC1A.8/SB1A.1/S11G.1   1105
+SV  /ALIC.1/CH11.1/SC1A.5/SB1A.1/S11G.1   1153
+SV  /ALIC.1/CH11.1/SC1A.9/SB1A.1/S11G.1   1153
+SV  /ALIC.1/CH11.1/SC1A.6/SB1A.1/S11G.1   1155
+SV  /ALIC.1/CH11.1/SC1A.10/SB1A.1/S11G.1   1155
+SV  /ALIC.1/CH11.1/SC1A.11/SB1A.1/S11G.1   1102
+SV  /ALIC.1/CH11.1/SC1A.12/SB1A.1/S11G.1   1106
+SV  /ALIC.1/CH11.1/SC1A.13/SB1A.1/S11G.1   1152
+SV  /ALIC.1/CH11.1/SC1A.14/SB1A.1/S11G.1   1156
+SV  /ALIC.1/CH11.1/SC1A.15/SB1A.1/S11G.1   1101
+SV  /ALIC.1/CH11.1/SC1A.16/SB1A.1/S11G.1   1107
+SV  /ALIC.1/CH11.1/SC1A.17/SB1A.1/S11G.1   1151
+SV  /ALIC.1/CH11.1/SC1A.18/SB1A.1/S11G.1   1157
+SV  /ALIC.1/CH11.1/SC1A.19/SB1A.1/S11G.1   1100
+SV  /ALIC.1/CH11.1/SC1A.20/SB1A.1/S11G.1   1108
+SV  /ALIC.1/CH11.1/SC1A.21/SB1A.1/S11G.1   1150
+SV  /ALIC.1/CH11.1/SC1A.22/SB1A.1/S11G.1   1158
 
-SV  /ALIC.1/SC2A.1/SB2A.1/SG2A.1   1204
-SV  /ALIC.1/SC2A.2/SB2A.1/SG2A.1   1254
-SV  /ALIC.1/SC2A.3/SB2A.1/SG2A.1   1203
-SV  /ALIC.1/SC2A.7/SB2A.1/SG2A.1   1203
-SV  /ALIC.1/SC2A.4/SB2A.1/SG2A.1   1205
-SV  /ALIC.1/SC2A.8/SB2A.1/SG2A.1   1205
-SV  /ALIC.1/SC2A.5/SB2A.1/SG2A.1   1253
-SV  /ALIC.1/SC2A.9/SB2A.1/SG2A.1   1253
-SV  /ALIC.1/SC2A.6/SB2A.1/SG2A.1   1255
-SV  /ALIC.1/SC2A.10/SB2A.1/SG2A.1   1255
-SV  /ALIC.1/SC2A.11/SB2A.1/SG2A.1   1202
-SV  /ALIC.1/SC2A.12/SB2A.1/SG2A.1   1206
-SV  /ALIC.1/SC2A.13/SB2A.1/SG2A.1   1252
-SV  /ALIC.1/SC2A.14/SB2A.1/SG2A.1   1256
-SV  /ALIC.1/SC2A.15/SB2A.1/SG2A.1   1201
-SV  /ALIC.1/SC2A.16/SB2A.1/SG2A.1   1207
-SV  /ALIC.1/SC2A.17/SB2A.1/SG2A.1   1251
-SV  /ALIC.1/SC2A.18/SB2A.1/SG2A.1   1257
-SV  /ALIC.1/SC2A.19/SB2A.1/SG2A.1   1200
-SV  /ALIC.1/SC2A.20/SB2A.1/SG2A.1   1208
-SV  /ALIC.1/SC2A.21/SB2A.1/SG2A.1   1250
-SV  /ALIC.1/SC2A.22/SB2A.1/SG2A.1   1258
+SV  /ALIC.1/CH12.1/SC2A.1/SB2A.1/S12G.1   1204
+SV  /ALIC.1/CH12.1/SC2A.2/SB2A.1/S12G.1   1254
+SV  /ALIC.1/CH12.1/SC2A.3/SB2A.1/S12G.1   1203
+SV  /ALIC.1/CH12.1/SC2A.7/SB2A.1/S12G.1   1203
+SV  /ALIC.1/CH12.1/SC2A.4/SB2A.1/S12G.1   1205
+SV  /ALIC.1/CH12.1/SC2A.8/SB2A.1/S12G.1   1205
+SV  /ALIC.1/CH12.1/SC2A.5/SB2A.1/S12G.1   1253
+SV  /ALIC.1/CH12.1/SC2A.9/SB2A.1/S12G.1   1253
+SV  /ALIC.1/CH12.1/SC2A.6/SB2A.1/S12G.1   1255
+SV  /ALIC.1/CH12.1/SC2A.10/SB2A.1/S12G.1   1255
+SV  /ALIC.1/CH12.1/SC2A.11/SB2A.1/S12G.1   1202
+SV  /ALIC.1/CH12.1/SC2A.12/SB2A.1/S12G.1   1206
+SV  /ALIC.1/CH12.1/SC2A.13/SB2A.1/S12G.1   1252
+SV  /ALIC.1/CH12.1/SC2A.14/SB2A.1/S12G.1   1256
+SV  /ALIC.1/CH12.1/SC2A.15/SB2A.1/S12G.1   1201
+SV  /ALIC.1/CH12.1/SC2A.16/SB2A.1/S12G.1   1207
+SV  /ALIC.1/CH12.1/SC2A.17/SB2A.1/S12G.1   1251
+SV  /ALIC.1/CH12.1/SC2A.18/SB2A.1/S12G.1   1257
+SV  /ALIC.1/CH12.1/SC2A.19/SB2A.1/S12G.1   1200
+SV  /ALIC.1/CH12.1/SC2A.20/SB2A.1/S12G.1   1208
+SV  /ALIC.1/CH12.1/SC2A.21/SB2A.1/S12G.1   1250
+SV  /ALIC.1/CH12.1/SC2A.22/SB2A.1/S12G.1   1258
 
-SV  /ALIC.1/SC3A.1/SB3A.1/SG3A.1   1304
-SV  /ALIC.1/SC3A.2/SB3A.1/SG3A.1   1354
-SV  /ALIC.1/SC3A.3/SB3A.1/SG3A.1   1303
-SV  /ALIC.1/SC3A.7/SB3A.1/SG3A.1   1303
-SV  /ALIC.1/SC3A.4/SB3A.1/SG3A.1   1305
-SV  /ALIC.1/SC3A.8/SB3A.1/SG3A.1   1305
-SV  /ALIC.1/SC3A.5/SB3A.1/SG3A.1   1353
-SV  /ALIC.1/SC3A.9/SB3A.1/SG3A.1   1353
-SV  /ALIC.1/SC3A.6/SB3A.1/SG3A.1   1355
-SV  /ALIC.1/SC3A.10/SB3A.1/SG3A.1   1355
-SV  /ALIC.1/SC3A.11/SB3A.1/SG3A.1   1302
-SV  /ALIC.1/SC3A.12/SB3A.1/SG3A.1   1306
-SV  /ALIC.1/SC3A.13/SB3A.1/SG3A.1   1352
-SV  /ALIC.1/SC3A.14/SB3A.1/SG3A.1   1356
-SV  /ALIC.1/SC3A.15/SB3A.1/SG3A.1   1301
-SV  /ALIC.1/SC3A.16/SB3A.1/SG3A.1   1307
-SV  /ALIC.1/SC3A.17/SB3A.1/SG3A.1   1351
-SV  /ALIC.1/SC3A.18/SB3A.1/SG3A.1   1357
-SV  /ALIC.1/SC3A.19/SB3A.1/SG3A.1   1300
-SV  /ALIC.1/SC3A.20/SB3A.1/SG3A.1   1308
-SV  /ALIC.1/SC3A.21/SB3A.1/SG3A.1   1350
-SV  /ALIC.1/SC3A.22/SB3A.1/SG3A.1   1358
+SV  /ALIC.1/CH13.1/SC3A.1/SB3A.1/S13G.1   1304
+SV  /ALIC.1/CH13.1/SC3A.2/SB3A.1/S13G.1   1354
+SV  /ALIC.1/CH13.1/SC3A.3/SB3A.1/S13G.1   1303
+SV  /ALIC.1/CH13.1/SC3A.7/SB3A.1/S13G.1   1303
+SV  /ALIC.1/CH13.1/SC3A.4/SB3A.1/S13G.1   1305
+SV  /ALIC.1/CH13.1/SC3A.8/SB3A.1/S13G.1   1305
+SV  /ALIC.1/CH13.1/SC3A.5/SB3A.1/S13G.1   1353
+SV  /ALIC.1/CH13.1/SC3A.9/SB3A.1/S13G.1   1353
+SV  /ALIC.1/CH13.1/SC3A.6/SB3A.1/S13G.1   1355
+SV  /ALIC.1/CH13.1/SC3A.10/SB3A.1/S13G.1   1355
+SV  /ALIC.1/CH13.1/SC3A.11/SB3A.1/S13G.1   1302
+SV  /ALIC.1/CH13.1/SC3A.12/SB3A.1/S13G.1   1306
+SV  /ALIC.1/CH13.1/SC3A.13/SB3A.1/S13G.1   1352
+SV  /ALIC.1/CH13.1/SC3A.14/SB3A.1/S13G.1   1356
+SV  /ALIC.1/CH13.1/SC3A.15/SB3A.1/S13G.1   1301
+SV  /ALIC.1/CH13.1/SC3A.16/SB3A.1/S13G.1   1307
+SV  /ALIC.1/CH13.1/SC3A.17/SB3A.1/S13G.1   1351
+SV  /ALIC.1/CH13.1/SC3A.18/SB3A.1/S13G.1   1357
+SV  /ALIC.1/CH13.1/SC3A.19/SB3A.1/S13G.1   1300
+SV  /ALIC.1/CH13.1/SC3A.20/SB3A.1/S13G.1   1308
+SV  /ALIC.1/CH13.1/SC3A.21/SB3A.1/S13G.1   1350
+SV  /ALIC.1/CH13.1/SC3A.22/SB3A.1/S13G.1   1358
 
-SV  /ALIC.1/SC4A.1/SB4A.1/SG4A.1   1404
-SV  /ALIC.1/SC4A.2/SB4A.1/SG4A.1   1454
-SV  /ALIC.1/SC4A.3/SB4A.1/SG4A.1   1403
-SV  /ALIC.1/SC4A.7/SB4A.1/SG4A.1   1403
-SV  /ALIC.1/SC4A.4/SB4A.1/SG4A.1   1405
-SV  /ALIC.1/SC4A.8/SB4A.1/SG4A.1   1405
-SV  /ALIC.1/SC4A.5/SB4A.1/SG4A.1   1453
-SV  /ALIC.1/SC4A.9/SB4A.1/SG4A.1   1453
-SV  /ALIC.1/SC4A.6/SB4A.1/SG4A.1   1455
-SV  /ALIC.1/SC4A.10/SB4A.1/SG4A.1   1455
-SV  /ALIC.1/SC4A.11/SB4A.1/SG4A.1   1402
-SV  /ALIC.1/SC4A.12/SB4A.1/SG4A.1   1406
-SV  /ALIC.1/SC4A.13/SB4A.1/SG4A.1   1452
-SV  /ALIC.1/SC4A.14/SB4A.1/SG4A.1   1456
-SV  /ALIC.1/SC4A.15/SB4A.1/SG4A.1   1401
-SV  /ALIC.1/SC4A.16/SB4A.1/SG4A.1   1407
-SV  /ALIC.1/SC4A.17/SB4A.1/SG4A.1   1451
-SV  /ALIC.1/SC4A.18/SB4A.1/SG4A.1   1457
-SV  /ALIC.1/SC4A.19/SB4A.1/SG4A.1   1400
-SV  /ALIC.1/SC4A.20/SB4A.1/SG4A.1   1408
-SV  /ALIC.1/SC4A.21/SB4A.1/SG4A.1   1450
-SV  /ALIC.1/SC4A.22/SB4A.1/SG4A.1   1458
+SV  /ALIC.1/CH14.1/SC4A.1/SB4A.1/S14G.1   1404
+SV  /ALIC.1/CH14.1/SC4A.2/SB4A.1/S14G.1   1454
+SV  /ALIC.1/CH14.1/SC4A.3/SB4A.1/S14G.1   1403
+SV  /ALIC.1/CH14.1/SC4A.7/SB4A.1/S14G.1   1403
+SV  /ALIC.1/CH14.1/SC4A.4/SB4A.1/S14G.1   1405
+SV  /ALIC.1/CH14.1/SC4A.8/SB4A.1/S14G.1   1405
+SV  /ALIC.1/CH14.1/SC4A.5/SB4A.1/S14G.1   1453
+SV  /ALIC.1/CH14.1/SC4A.9/SB4A.1/S14G.1   1453
+SV  /ALIC.1/CH14.1/SC4A.6/SB4A.1/S14G.1   1455
+SV  /ALIC.1/CH14.1/SC4A.10/SB4A.1/S14G.1   1455
+SV  /ALIC.1/CH14.1/SC4A.11/SB4A.1/S14G.1   1402
+SV  /ALIC.1/CH14.1/SC4A.12/SB4A.1/S14G.1   1406
+SV  /ALIC.1/CH14.1/SC4A.13/SB4A.1/S14G.1   1452
+SV  /ALIC.1/CH14.1/SC4A.14/SB4A.1/S14G.1   1456
+SV  /ALIC.1/CH14.1/SC4A.15/SB4A.1/S14G.1   1401
+SV  /ALIC.1/CH14.1/SC4A.16/SB4A.1/S14G.1   1407
+SV  /ALIC.1/CH14.1/SC4A.17/SB4A.1/S14G.1   1451
+SV  /ALIC.1/CH14.1/SC4A.18/SB4A.1/S14G.1   1457
+SV  /ALIC.1/CH14.1/SC4A.19/SB4A.1/S14G.1   1400
+SV  /ALIC.1/CH14.1/SC4A.20/SB4A.1/S14G.1   1408
+SV  /ALIC.1/CH14.1/SC4A.21/SB4A.1/S14G.1   1450
+SV  /ALIC.1/CH14.1/SC4A.22/SB4A.1/S14G.1   1458