changes in the MagF constructor
authorfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 15 Oct 2009 17:37:49 +0000 (17:37 +0000)
committerfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 15 Oct 2009 17:37:49 +0000 (17:37 +0000)
96 files changed:
ACORDE/macros/Config.C
BCM/Config_BCM.C
EMCAL/macros/Config.C
EMCAL/macros/trackMatching/FindMatches.C
FMD/Config.C
FMD/scripts/DummyConfig.C
FMD/scripts/pdc06_config.C
HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.cxx
HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.cxx
HLT/TRD/AliHLTTRDTrackerV1Component.cxx
HMPID/HESDfromKin.C
HMPID/Hconfig.C
HMPID/Hnew.C
MONITOR/galice.C
MUON/AliMUONChamberCalibrationTask.cxx
MUON/Config.C
MUON/DIMUONFakes.C
MUON/MUONClusterInfo.C
MUON/MUONFakes.C
MUON/MUONRecoCheck.C
MUON/MUONRefit.C
MUON/MUONResoEffChamber.C
MUON/MUONefficiency.C
MUON/MUONmassPlot_ESD.C
PHOS/ConfigTestSuite.C
PHOS/macros/AlignmentDB/Config.C
PHOS/macros/Embed/Config.C
PHOS/macros/testSuite/ConfigTestSuite.C
PHOS/macros/testSuite/ConfigTestSuiteHij.C
PWG1/macros/RunPerformanceTaskMC.C
PWG1/macros/taskComp.C
STEER/AliMagF.cxx
STEER/AliMagF.h
TFluka/macro/FlukaConfig.C
TOF/AliTOFconfig.C
TPC/AliTPCcalibDB.cxx
TPC/Cal/AliTPCCreateDummyCDB.C
TPC/CalibMacros/CalibExB.C
TPC/ConfigKr.C
TPC/macros/ConfigOCDB.C
TPC/testMC/ConfigCosmic.C
TPC/testMC/ConfigCosmic0Field.C
TPC/testMC/ConfigCosmicBox.C
TPC/testMC/ConfigCosmicField05.C
TPC/testMC/ConfigHM.C
TPC/testMC/ConfigHPT.C
TPC/testMC/ConfigHPT1.C
TPC/testMC/ConfigLM.C
TPC/testMC/ConfigPP.C
TPC/testMC/Config_AliGenCosmicsParam.C
TPHIC/ConfigTPHIC.C
TRD/Macros/AliTRDConfigPID.C
ZDC/ConfigGenZDC.C
doc/aliroot-primer/scripts/Config.C
macros/Config.C
macros/ConfigPPR.C
macros/Config_AliGenCosmicsParam.C
macros/Config_PDC06.C
macros/Config_PDC06_MUON.C
macros/Config_PDC07_MBias_MUON.C
macros/Config_PythiaHeavyFlavours.C
macros/g4ConfigCommon.C
macros/g4ConfigCommon1.C
macros/plotField.C
prod/LHC08d10/Config.C
prod/LHC08d11/Config.C
prod/LHC08d12/Config.C
prod/LHC08d13/Config.C
prod/LHC08d14/Config.C
prod/LHC08d15/Config.C
prod/LHC08d16/Config.C
prod/LHC08d17/Config.C
prod/LHC08d5/Config.C
prod/LHC08d6/Config.C
prod/LHC08d8/Config.C
prod/LHC08d9/Config.C
prod/LHC09a1/Config.C
prod/LHC09a10/Config.C
prod/LHC09a11/Config.C
prod/LHC09a12/Config.C
prod/LHC09a13/Config.C
prod/LHC09a14/Config.C
prod/LHC09a15/Config.C
prod/LHC09a16/Config.C
prod/LHC09c1/Config.C
test/PbPbbench/Config.C
test/QA/Config.C
test/embedding/Config.C
test/fpprod/Config.C
test/genkine/sim/Config.C
test/gun/Config.C
test/merge/backgr/Config.C
test/merge/signal/Config.C
test/pileup/Config.C
test/ppbench/Config.C
test/pploadlibs/Config.C

index d2e11a6aca7781f865c61fcb34c8c54ec5938831..f30d86ec3cf97ae86758d3a2f7b4de6b175af8ff 100644 (file)
@@ -184,7 +184,7 @@ void Config()
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
     
-  AliMagF* field = new AliMagF("Maps","Maps",2, -1.,-1., 10.,mag);
+  AliMagF* field = new AliMagF("Maps","Maps",-1.,-1., mag);
   TGeoGlobalMagField::Instance()->SetField(field);
 
   rl->CdGAFile();
index 8f037ce0bae3e2d17ea7ee1c52c0c1beb3751e57..952273a4be1448d6f80f80ebe903a2505443ed7c 100644 (file)
@@ -153,7 +153,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t iABSO   = 1;
     Int_t iACORDE = 0;
index c4f4dfe99072950bc023bbc364ca7f0f2fccf098..f03f47449088fedb51048eb66e7dd751ff9c89dd 100755 (executable)
@@ -152,7 +152,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.5 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
 
     Int_t   iABSO  =  0;
     Int_t   iDIPO  =  0;
index 547c93fb4af9d5d0b2276ed7735be29b358d564f..e60a4c51009a00c37232dfc81d85ebca31d80c4a 100755 (executable)
@@ -26,8 +26,8 @@ void FindMatches(const char *fileOut = "matchESD.root")
        rl->LoadgAlice();
        gAlice = rl->GetAliRun();
        
-       //AliMagF *magf = new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG);
-       AliMagF *magf = new AliMagF("Maps","Maps", 2, 1., 1.);
+       //AliMagF *magf = new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG);
+       AliMagF *magf = new AliMagF("Maps","Maps", 1., 1.);
        
        //
        // Open ESD file and recoveries TTree of ESD objects.
index adeb94981517b4d09b7a18a810ab7db6278e166b..e49b6dc07d4669d355a45c6a03cc11a02802f7e3 100644 (file)
@@ -361,7 +361,7 @@ Config()
     
   //__________________________________________________________________
   // Field (L3 0.4 T)
-  AliMagF* field = new AliMagF("Maps","Maps",2, -1., -1., 10.,mag);
+  AliMagF* field = new AliMagF("Maps","Maps",-1., -1., mag);
   TGeoGlobalMagField::Instance()->SetField(field);
 
   rl->CdGAFile();
index a1f6a6d118b7c39d53a3a3a468d39f1296e22e32..2a54e2104e891ef665d9464676455808d8e21f2b 100644 (file)
@@ -385,7 +385,7 @@ Config()
 
   //__________________________________________________________________
   // Field (L3 0.4 T)
-  AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+  AliMagF* field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
   field->SetL3ConstField(0); //Using const. field in the barrel
   TGeoGlobalMagField::Instance()->SetField(field);
 
index 2ec6debd97aa21f01a866c0f2cee4a2759ffd032..bfc624c3ebe56d988c5a32252afcbaa05b5a8e51 100644 (file)
@@ -349,7 +349,7 @@ void Config()
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
     
-  AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,mag);
+  AliMagF* field = new AliMagF("Maps","Maps",1.,1.,mag);
   field->SetL3ConstField(0); //Using const. field in the barrel
   TGeoGlobalMagField::Instance()->SetField(field);
 
index 33f84e00408eb6288184777ededd17c01dd5be4f..f2445a40e9f4bac263638eb7a96a81d6a4e72c56 100644 (file)
@@ -329,7 +329,7 @@ int AliHLTTPCOfflineTrackerCalibComponent::Configure(const char* arguments)
        // TODO: does the factor need adjustment?
        const AliMagF* currentMap = (AliMagF*)TGeoGlobalMagField::Instance()->GetField();
        if (!currentMap) {
-         AliMagF* field = new AliMagF("MagneticFieldMap", "BMap", 2, 1., 1., 10., map);
+         AliMagF* field = new AliMagF("MagneticFieldMap", "BMap", 1., 1., map);
          TGeoGlobalMagField::Instance()->SetField(field);
          HLTInfo("Solenoid Field set to: %f map %d", SolenoidBz, map);
        } else if (currentMap->GetMapType()!=map) {
index d07bccefd61d70c3c64d60fcbbef24a1d6a595e5..47a4f2b7985ec9c0dfa6d24d09dcfed84b383565 100644 (file)
@@ -321,7 +321,7 @@ int AliHLTTPCOfflineTrackerComponent::Configure(const char* arguments)
        // TODO: does the factor need adjustment?
        const AliMagF* currentMap = (AliMagF*)TGeoGlobalMagField::Instance()->GetField();
        if (!currentMap) {
-         AliMagF* field = new AliMagF("MagneticFieldMap", "BMap", 2, 1., 1., 10., map);
+         AliMagF* field = new AliMagF("MagneticFieldMap", "BMap", 1., 1., map);
          TGeoGlobalMagField::Instance()->SetField(field);
          HLTInfo("Solenoid Field set to: %f map %d", SolenoidBz, map);
        } else if (currentMap->GetMapType()!=map) {
index d2622af5651fcd3ba4c84616b5af582db3c7fe44..54acea9726f29274ca019f52648aee4ca59e5853 100644 (file)
@@ -548,12 +548,12 @@ int AliHLTTRDTrackerV1Component::SetParams()
     AliMagF* field;
     if (fMagneticField == 0){
       // magnetic field OFF
-      field = new AliMagF("Maps","Maps",2,0.,0., 10.,AliMagF::k5kGUniform);
+      field = new AliMagF("Maps","Maps",0.,0.,AliMagF::k5kGUniform);
       TGeoGlobalMagField::Instance()->SetField(field);
       HLTDebug("Magnetic field is OFF.");
     }else{
       // magnetic field ON
-      field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+      field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
       TGeoGlobalMagField::Instance()->SetField(field);
       HLTDebug("Magnetic field is ON.");
       if( fMagneticField < 0 )
index 4e80cce8143dff82eec0e6532157f098750772c4..e034633df5ce14e6288fde6ffedf785f880174e7 100644 (file)
@@ -326,8 +326,7 @@ Bool_t InitGRP() {
   Printf("------------------------------");
   Printf(" Summary for B: %s",s.Data());
   Printf("------------------------------");
-  AliMagF* fld = new AliMagF("MagneticFieldMap", s.Data(), 2, fcL3, fcDip, 10., map, path, 
-                            btype,beamenergy);
+  AliMagF* fld = new AliMagF("MagneticFieldMap", s.Data(), fcL3, fcDip, map, btype,beamenergy,path);
   TGeoGlobalMagField::Instance()->SetField( fld );
   TGeoGlobalMagField::Instance()->Lock();
   //
index 6c3b800052561e482c0cb4e441999b06587dac93..9249879c0c26b429f1133b5f1f4088db49a85b02 100644 (file)
@@ -778,13 +778,13 @@ void HmpConfig::WriteConfig()
   WritePhys(pF); //physics processes
   
 //Field
-       if(fMagBG->GetButton(kFld0)->GetState())     fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 0,1,10,AliMagF::k2kG));// NO field\n");
-  else if(fMagBG->GetButton(kFld2)->GetState())     fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 1,1,10,AliMagF::k2kG));//0.2 Tesla field\n");
-  else if(fMagBG->GetButton(kFld4)->GetState())     fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 1,1,10,AliMagF::k4kG));//0.4 Tesla field\n");
-  else if(fMagBG->GetButton(kFld5)->GetState())     fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 1,1,10,AliMagF::k5kG));//0.5 Tesla field\n");
-  else if(fMagBG->GetButton(kFld_2)->GetState())    fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k2kG));//-0.2 Tesla field\n");
-  else if(fMagBG->GetButton(kFld_4)->GetState())    fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k4kG));//-0.4 Tesla field\n");
-  else if(fMagBG->GetButton(kFld_5)->GetState())    fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k5kG));//-0.5 Tesla field\n");
+       if(fMagBG->GetButton(kFld0)->GetState())     fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",0,0,AliMagF::k5kGUniform));// NO field\n");
+  else if(fMagBG->GetButton(kFld2)->GetState())     fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",1,1,AliMagF::k2kG));//0.2 Tesla field\n");
+       //  else if(fMagBG->GetButton(kFld4)->GetState())     fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",1,1,AliMagF::k4kG));//0.4 Tesla field\n");
+  else if(fMagBG->GetButton(kFld5)->GetState())     fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",1,1,AliMagF::k5kG));//0.5 Tesla field\n");
+  else if(fMagBG->GetButton(kFld_2)->GetState())    fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",-1,1,AliMagF::k2kG));//-0.2 Tesla field\n");
+       //  else if(fMagBG->GetButton(kFld_4)->GetState())    fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",-1,1,AliMagF::k4kG));//-0.4 Tesla field\n");
+  else if(fMagBG->GetButton(kFld_5)->GetState())    fprintf(pF,"  TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",-1,1,AliMagF::k5kG));//-0.5 Tesla field\n");
   
   fprintf(pF,"  pAL->CdGAFile();\n\n");                                 //????       
 //Generator 
index 335abb106845b4250972b6ac421e60e837dc0f8e..21c8ad9869ce04a6e5cad38aff61d5cf0cb6c673 100644 (file)
@@ -231,13 +231,13 @@ void HmpGui::CreateConfigC()
   f<<Form("  gMC->SetExternalDecayer(pDecayer);\n\n");
   
 //Field
-       if(fMagBG->GetButton(kFld0)->GetState())     f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",0,1,1,10,0));       //no field\n\n");
-  else if(fMagBG->GetButton(kFld2)->GetState())     f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,1,1,10,0));//0.2 Tesla field\n\n");
-  else if(fMagBG->GetButton(kFld4)->GetState())     f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,1,1,10,1));//0.4 Tesla field\n\n");
-  else if(fMagBG->GetButton(kFld5)->GetState())     f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,1,1,10,2));//0.5 Tesla field\n\n");
-  else if(fMagBG->GetButton(kFld_2)->GetState())    f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,0));//-0.2 Tesla field\n\n");
-  else if(fMagBG->GetButton(kFld_4)->GetState())    f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,1));//-0.4 Tesla field\n\n");
-  else if(fMagBG->GetButton(kFld_5)->GetState())    f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,2));//-0.5 Tesla field\n\n");
+  if     (fMagBG->GetButton(kFld0)->GetState())     f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",0,0,AliMagF::k5kGUniform));       //no field\n\n");
+  else if(fMagBG->GetButton(kFld2)->GetState())     f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",1,1,AliMagF::k2kG));//0.2 Tesla field\n\n");
+//  else if(fMagBG->GetButton(kFld4)->GetState())     f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",1,1,1));//0.4 Tesla field\n\n");
+  else if(fMagBG->GetButton(kFld5)->GetState())     f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",1,1,AliMagF::k5kG));//0.5 Tesla field\n\n");
+  else if(fMagBG->GetButton(kFld_2)->GetState())    f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",-1,-1,AliMagF::k2kG));//-0.2 Tesla field\n\n");
+       //  else if(fMagBG->GetButton(kFld_4)->GetState())    f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",-1,1,1));//-0.4 Tesla field\n\n");
+  else if(fMagBG->GetButton(kFld_5)->GetState())    f<<Form("  gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",-1,-1,AliMagF::k5kG));//-0.5 Tesla field\n\n");
   
   if(fProBG->GetButton(kDCAY)->GetState()) f<<Form("  gMC->SetProcess(\"DCAY\",1);  ");else f<<Form("  gMC->SetProcess(\"DCAY\",0);  ");
   if(fProBG->GetButton(kPAIR)->GetState()) f<<Form("  gMC->SetProcess(\"PAIR\",1);  ");else f<<Form("  gMC->SetProcess(\"PAIR\",0);  ");
index a158e8e1e0e5aecc6e23cea9c9e8076b950b7993..c979a7a31885d3046af47f3db4cdd20a211e81d1 100644 (file)
@@ -18,7 +18,7 @@ void Config()
     new TGeant3("C++ Interface to Geant3");
 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t   iABSO  =  0;
     Int_t   iDIPO  =  0;
index 89e45e54667f5e88cc3a6eaeef0f1ee58ec052fa..b3de1395ef25e2692634c0ee4822dee2a9d0d921 100644 (file)
@@ -174,7 +174,7 @@ void AliMUONChamberCalibrationTask::LocalInit()
 
   if ( !TGeoGlobalMagField::Instance()->GetField() ) {
     AliInfo( "Loading field map..." );
-    AliMagF* field = new AliMagF( "Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG );
+    AliMagF* field = new AliMagF( "Maps","Maps", 1., 1., AliMagF::k5kG );
     TGeoGlobalMagField::Instance()->SetField( field );
     TGeoGlobalMagField::Instance()->Lock();
   }
index 5413b1d61861004586f82bc99cf91e0e91c25f3e..0b085c981f291bcc16604e79fc6ed2cdb301c072 100644 (file)
@@ -187,7 +187,7 @@ void Config(char directory[100]="", char option[6]="param", const char* digitsto
   }  
   //============================================================= 
   // Field (L3 0.5 T)
-  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1, 10., AliMagF::k5kG));
+  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1, AliMagF::k5kG));
   //============================================================= 
   //=================== Alice BODY parameters =============================
   AliBODY *BODY = new AliBODY("BODY","Alice envelop");
index 115c1474cc238e5d441b60783caea45da69c8903..6f6da72886c74106721ade04045c4750ec925a56 100644 (file)
@@ -300,7 +300,7 @@ void Prepare(AliMUONRecoParam *&recoParam, Double_t &sigmaCut)
   // waiting for mag field in CDB 
   if (!TGeoGlobalMagField::Instance()->GetField()) {
     printf("Loading field map...\n");
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
     TGeoGlobalMagField::Instance()->SetField(field);
   }
   // set the magnetic field for track extrapolations
index 2f49635186f1ea9a44eb218650366836fbe83bec..7109f67866b4e4150fe2af997cc90e4fd8d74d69 100644 (file)
@@ -391,7 +391,7 @@ void Prepare()
   // set mag field
   if (!TGeoGlobalMagField::Instance()->GetField()) {
     printf("Loading field map...\n");
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
     TGeoGlobalMagField::Instance()->SetField(field);
   }
   
index 70ed78f1a8039fc1eba5db33f832473877f17c30..e53bb56f9d56e7aa5dcebb18706b84971e160921 100644 (file)
@@ -375,7 +375,7 @@ void Prepare(AliMUONRecoParam *&recoParam, Double_t &sigmaCut)
   // waiting for mag field in CDB 
   if (!TGeoGlobalMagField::Instance()->GetField()) {
     printf("Loading field map...\n");
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1., AliMagF::k5kG);
     TGeoGlobalMagField::Instance()->SetField(field);
   }
   // set the magnetic field for track extrapolations
index 564acb71bd6582b9b897916dbe704d8ee8b4f94d..0c1d278bcd9aca4b8538416e6f956ddb84f08bf2 100644 (file)
@@ -91,7 +91,7 @@ void MUONRecoCheck (Int_t nEvent = -1, char* geoFilename = "geometry.root",
   // waiting for mag field in CDB 
   if (!TGeoGlobalMagField::Instance()->GetField()) {
     printf("Loading field map...\n");
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
     TGeoGlobalMagField::Instance()->SetField(field);
   }
   // set the magnetic field for track extrapolations
index a1b85eabe5fadad37b40380c0a8d7c56ed6c4f0f..1bddca84a2c4347da1e4a206dcd781a1b179a274 100644 (file)
@@ -216,7 +216,7 @@ void Prepare()
   // waiting for mag field in CDB 
   if (!TGeoGlobalMagField::Instance()->GetField()) {
     printf("Loading field map...\n");
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
     TGeoGlobalMagField::Instance()->SetField(field);
   }
   // set the magnetic field for track extrapolations
index d60a85aa4ac109842398051e857ae80b88f72354..b7742801689230de124b03f2367cc94e3ac18712 100644 (file)
@@ -246,7 +246,7 @@ void efficiencyThetaPhi( Int_t event2Check=0, char * filename="galice.root" )
 //Set mag field; waiting for mag field in CDB 
   if (!TGeoGlobalMagField::Instance()->GetField()) {
     printf("Loading field map...\n");
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1., AliMagF::k5kG);
     TGeoGlobalMagField::Instance()->SetField(field);
   }
 
@@ -511,7 +511,7 @@ void efficiencyThetaI( Int_t event2Check=0, char * filename="galice.root" )
 //Set mag field; waiting for mag field in CDB 
   if (!TGeoGlobalMagField::Instance()->GetField()) {
     printf("Loading field map...\n");
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1., AliMagF::k5kG);
     TGeoGlobalMagField::Instance()->SetField(field);
   }  printf("Loading field map...\n");
  
index 7d1792719a309e3d3eebd7cc84331c5c8243928e..094471accfe01b8d7f995c41cef1187994030265 100644 (file)
@@ -207,7 +207,7 @@ Bool_t MUONefficiency( char* filename = "galice.root", char* geoFilename = "geom
   // waiting for mag field in CDB 
   if (!TGeoGlobalMagField::Instance()->GetField()) {
     printf("Loading field map...\n");
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
     TGeoGlobalMagField::Instance()->SetField(field);
   }
   // set the magnetic field for track extrapolations
index 3acd495f518cfbe791ba042daffa032bebd0b746..91c24ee698d16f360fda0d6f1b4c24e4384982a2 100644 (file)
@@ -141,7 +141,7 @@ Bool_t MUONmassPlot(Int_t ExtrapToVertex = -1, char* geoFilename = "geometry.roo
   // waiting for mag field in CDB 
   if (!TGeoGlobalMagField::Instance()->GetField()) {
     printf("Loading field map...\n");
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
     TGeoGlobalMagField::Instance()->SetField(field);
   }
   // set the magnetic field for track extrapolations
index 8533ed521be7c39f0f4f85ba824ef2a3a821a8c8..ca1f4023bd408dac91cc5266ff656e1c2c3b7a53 100644 (file)
@@ -129,7 +129,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t   iABSO  =  0;
     Int_t   iDIPO  =  0;
index c9b744e56d0177c11df4fff5407c807e8478de67..cd656f2a348537b0bebe13b856f651dff8e407ae 100644 (file)
@@ -158,7 +158,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.5 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
 
     Int_t   iABSO  =  0;
     Int_t   iDIPO  =  0;
index 5da8fa447aa6dfd4e195391c770667422c5da43d..ea00dae0e48e6582890c0c41ca621c609b28a9aa 100644 (file)
@@ -168,7 +168,7 @@ void Config()
                                                                                 
 // Field (L3 0.4 T)
     //Zero magnetic field
-    AliMagF* field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    AliMagF* field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
     //    AliMagF* field = new AliMagF("Maps","Maps", 2, -1., -1., 10., smag);
     TGeoGlobalMagField::Instance()->SetField(field);
 
index 88ef9c771cffc4c903c8c80da5de7b21731f36e8..9b5f6cd90cda1243d6acbff74cde157f5e6119e5 100644 (file)
@@ -130,7 +130,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t   iABSO  =  0;
     Int_t   iDIPO  =  0;
index 2bbe0faae2b92c125bb4a42010ad36e8026cd833..36f4f565a6d54bd29035b3cf381085b430d7ab92 100644 (file)
@@ -106,7 +106,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t   iABSO  =  0;
     Int_t   iDIPO  =  0;
index 157b59343c46ccaa523c79d4bcf461dcd609e9b6..eebb2fba5d667afbd157236af1208a564ad30b15 100644 (file)
@@ -30,7 +30,7 @@
   //AliGeomManager::LoadGeometry("/lustre/alice/jacek/sim/HEADJB/flatPt_uniB/0/geometry.root");
 
   // set magnetic field
-  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
   gROOT->LoadMacro("$ALICE_ROOT/PWG1/macros/RunPerformanceTaskMC.C");
   RunPerformanceTaskMC(chain, kTRUE, kFALSE, kFALSE, 0);
@@ -48,7 +48,7 @@
 
   // set magnetic field
   // the best is to create macro MagField.C with the line: 
-  // TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+  // TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
   gProof->Exec("gROOT->Macro(\"MagField.C\")");
 
   gROOT->LoadMacro("$ALICE_ROOT/PWG1/macros/RunPerformanceTaskMC.C");
@@ -73,7 +73,7 @@
   //AliGeomManager::LoadGeometry("/lustre/alice/local/TRDdata/SIM/P-Flat/TRUNK/test/RUN0/geometry.root");
 
   // set magnetic field
-  gProof->Exec("gROOT->ProcessLine(\"TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\", 2, 1., 1., 10., AliMagF::k5kG))\")");
+  gProof->Exec("gROOT->ProcessLine(\"TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\", 1., 1., AliMagF::k5kG))\")");
 
   gROOT->LoadMacro("$ALICE_ROOT/PWG1/macros/RunPerformanceTaskMC.C");
   RunPerformanceTaskMC(chain, kTRUE, kTRUE, kTRUE);
index fe4af06504e0813e3a544a7ac27902497cc37dc1..7a77ef6ef6a769369bb6ac9ef55230575b86735e 100644 (file)
@@ -96,7 +96,7 @@ void Init(){
   TGeoManager::Import("/u/miranov/proof/geometry.root");
   AliGeomManager::LoadGeometry("/u/miranov/proof/geometry.root");
   
-  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
 
 }
index c32309ee256209ab5f9617ce3688a2fd6403481a..eda588c538297fef7a60e2127cc4950e03de9e0c 100644 (file)
@@ -73,16 +73,15 @@ AliMagF::AliMagF():
 }
 
 //_______________________________________________________________________
-AliMagF::AliMagF(const char *name, const char* title, Int_t integ, 
-                Double_t factorSol, Double_t factorDip, 
-                Double_t fmax, BMap_t maptype, const char* path,
-                BeamType_t bt, Double_t be):
+AliMagF::AliMagF(const char *name, const char* title, Double_t factorSol, Double_t factorDip, 
+                BMap_t maptype, BeamType_t btype, Double_t benergy, Int_t integ, Double_t fmax, 
+                const char* path):
   TVirtualMagField(name),
   fMeasuredMap(0),
   fMapType(maptype),
   fSolenoid(0),
-  fBeamType(bt),
-  fBeamEnergy(be),
+  fBeamType(btype),
+  fBeamEnergy(benergy),
   //
   fInteg(integ),
   fPrecInteg(1),
@@ -109,6 +108,11 @@ AliMagF::AliMagF(const char *name, const char* title, Int_t integ,
   }
   if (fInteg == 0) fPrecInteg = 0;
   //
+  if (fBeamEnergy<=0 && fBeamType!=kNoBeamField) {
+    if      (fBeamType == kBeamTypepp) fBeamEnergy = 7000.; // max proton energy
+    else if (fBeamType == kBeamTypeAA) fBeamEnergy = 5500;  // max PbPb energy
+    AliInfo("Maximim possible beam energy for requested beam is assumed");
+  } 
   const char* parname = 0;
   //  
   if      (fMapType == k2kG) parname = fDipoleOFF ? "Sol12_Dip0_Hole":"Sol12_Dip6_Hole";
@@ -129,7 +133,8 @@ AliMagF::AliMagF(const char *name, const char* title, Int_t integ,
               factorSol,(fMapType==k5kG||fMapType==k5kGUniform)?5.:2.,
               fDipoleOFF ? "OFF":"ON",factorDip,fMapType==k5kGUniform?" |Constant Field!":""));
   AliInfo(Form("Machine B fields for %s beam (%.0f GeV): QGrad: %.4f Dipole: %.4f",
-              bt==kBeamTypeAA ? "A-A":(bt==kBeamTypepp ? "p-p":"OFF"),be,fQuadGradient,fDipoleField));
+              fBeamType==kBeamTypeAA ? "A-A":(fBeamType==kBeamTypepp ? "p-p":"OFF"),
+              fBeamEnergy,fQuadGradient,fDipoleField));
 }
 
 //_______________________________________________________________________
@@ -239,7 +244,7 @@ AliMagF& AliMagF::operator=(const AliMagF& src)
 //_______________________________________________________________________
 void AliMagF::InitMachineField(BeamType_t btype, Double_t benergy)
 {
-  if (btype==kNoBeamField || benergy<1.) {
+  if (btype==kNoBeamField) {
     fQuadGradient = fDipoleField = fCCorrField = fACorr1Field = fACorr2Field = 0.;
     return;
   }
@@ -496,7 +501,7 @@ AliMagF* AliMagF::CreateFieldMap(Float_t l3Cur, Float_t diCur, Int_t convention,
   // LHC and DCS08 conventions have opposite dipole polarities
   if ( GetPolarityConvention() != convention) sclDip = -sclDip;
   //
-  return new AliMagF("MagneticFieldMap", ttl, 2, sclL3, sclDip, 10., map, path,btype,beamenergy);
+  return new AliMagF("MagneticFieldMap", ttl,sclL3,sclDip,map,btype,beamenergy,2,10.,path);
   //
 }
 
index 834c24b59f2d9047ab32c67c67eb75b535fdb79c..9313323718c149d7832f277c4485c66a9a05522a 100644 (file)
@@ -24,11 +24,10 @@ class AliMagF : public TVirtualMagField
   enum             {kOverrideGRP=BIT(14)}; // don't recreate from GRP if set
   //
   AliMagF();
-  AliMagF(const char *name, const char* title, Int_t integ, 
-         Double_t factorSol=1., Double_t factorDip=1., 
-         Double_t fmax=15, BMap_t maptype = k5kG,
-         const char* path="$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root",
-         BeamType_t btype=kBeamTypepp, Double_t benergy=7000.);
+  AliMagF(const char *name, const char* title, Double_t factorSol=1., Double_t factorDip=1., 
+         BMap_t maptype = k5kG, BeamType_t btype=kBeamTypepp,
+         Double_t benergy=-1., Int_t integ=2, Double_t fmax=10, 
+         const char* path="$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root");
   AliMagF(const AliMagF& src);             
   AliMagF& operator=(const AliMagF& src);
   virtual ~AliMagF();
index 7be75dfd41f3639517a031d2c23e73a7c6c049cd..a52ab448b5b3866d8ce75cc3811b49bc3ef193f0 100644 (file)
@@ -200,7 +200,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
 
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
index 5fc12a9ea45af4e31ece78c2266f749850eeb817..7b637efe2aa677bc07f9f28e116b7cb315ab89ed 100644 (file)
@@ -193,14 +193,14 @@ void Config()
     
     
 // Field (L3 +-0.2/0.5 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",2, -1,-1, 10,AliMagF::k5kG)); // +0.5/-0.7
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",-1,-1, AliMagF::k5kG)); // +0.5/-0.7
     /*
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",2,  1, 1, 10,AliMagF::k5kG)); // -0.5/-0.7
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",2, -1,-1, 10,AliMagF::k2kG)); // +0.2/-0.7
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",2,  1, 1, 10,AliMagF::k2kG)); // -0.2/+0.7
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",2,  1, 0, 10,AliMagF::k5kG)); // +-0.5/0
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",2,  1, 0, 10,AliMagF::k2kG)); // +-0.2/0
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",2,  0, 0, 10,AliMagF::k5kGUniform)); // 0/0
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1, 1, AliMagF::k5kG)); // -0.5/-0.7
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",-1,-1, AliMagF::k2kG)); // +0.2/-0.7
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1, 1, AliMagF::k2kG)); // -0.2/+0.7
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1, 0, AliMagF::k5kG)); // +-0.5/0
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1, 0, AliMagF::k2kG)); // +-0.2/0
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 0, 0, AliMagF::k5kGUniform)); // 0/0
     */
 
 //
index 43a18bdc51c9d1661986470875da3117cf6ff025..2382ac4ba3e047cdf677e3fb60194dcdc7b38e82 100644 (file)
@@ -741,7 +741,7 @@ void AliTPCcalibDB::RegisterExB(Int_t index, Float_t bz, Bool_t bdelete){
   Float_t factor =  bz/(5.);  // default b filed in Cheb with minus sign
                               // was chenged in the Revision ???? (Ruben can you add here number)
   
-  AliMagF*   bmap = new AliMagF("MapsExB","MapsExB", 2,factor,1., 10.,AliMagF::k5kG,"$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root");
+  AliMagF*   bmap = new AliMagF("MapsExB","MapsExB", factor,TMath::Sign(1.f,factor),AliMagF::k5kG);
   
   AliTPCExBFirst *exb  = new  AliTPCExBFirst(bmap,0.88*2.6400e+04,50,50,50);
   AliTPCExB::SetInstance(exb);
index 615f96efaf96118d374be3c087781bdda0dde2ef..4bc59ed9b1080c62b74070660ea937a58c24fa1c 100644 (file)
@@ -217,7 +217,7 @@ void AliTPCCreateDummyCDB()
   //     currently scaling factor 0 used - no magnetic field
   //
   metaData = CreateMetaObject("AliTPCExB");
-  AliMagF* field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kG));
+  AliMagF* field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kG));
   AliTPCExBFirst *exbfirst = new  AliTPCExBFirst(field,2.83000000000000000e+04,50,50,50);
   StoreObject("TPC/Calib/ExB", exbfirst, metaData); 
 
index a4875bcab6ae7ac14003f238c51d58472e5d6a35..28ff8c0b70fa55db5b993d2e22c8ab552dafe3c4 100644 (file)
@@ -2,11 +2,11 @@ void Init(){
   //
   // Initialize
   //
-  AliMagF* field = new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG);
+  AliMagF* field = new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG);
   AliTPCExB::RegisterField(0,field);
-  AliMagF* fieldC0 = new AliMagF("Maps","Maps", 2, 1, 1, 10., AliMagF::k5kG);
+  AliMagF* fieldC0 = new AliMagF("Maps","Maps", 1, 1, AliMagF::k5kG);
   AliTPCExB::RegisterField(1,fieldC0);
-  AliMagF* fieldC1 = new AliMagF("Maps","Maps", 2, 1, 1, 10., AliMagF::k5kG,kTRUE,"$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root");
+  AliMagF* fieldC1 = new AliMagF("Maps","Maps", 1, 1, AliMagF::k5kG);
   AliTPCExB::RegisterField(2,fieldC1);
 
   gSystem->Load("libSTAT.so");
index 9afaba2dc66b5707bbe1ea9e5e875b1486701700..337f146b06ac5e6594318900618b157b486fb60c 100644 (file)
@@ -134,7 +134,7 @@ void Config()
     gener->Init();
 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     // detectors - only the TPC is relevant
 
index f31f7e2bf6c1739157fecf6b6d7070f88efdd354..5d5b81dc6a34a841f57366d3e8d0113afb1bc6a1 100644 (file)
@@ -58,7 +58,7 @@ void SetupCustom(Int_t run){
     bzfac=1;
     bz=5;
   }
-  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, bzfac, 1., 10., smag));
+  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", bzfac, 1., smag));
 
   printf("\n\nSET EXB FIELD\t%f\n\n", -bz);
   AliTPCcalibDB::Instance()->SetExBField(-bz);
index 6de492a743459a9fe5d59433a6498b0d1027504b..8767d2e87a82abca9988a537d50e3e87b4058748 100644 (file)
@@ -269,7 +269,7 @@ void Config()
     
     
 // Field
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., smag));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., smag));
     rl->CdGAFile();
 
 
index 4ad914762130f3223120154eb54c5b0ce2d47ba5..70bc42d4412e9a50d15ba70b4327c8f27e2ecccd 100644 (file)
@@ -183,8 +183,8 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    //    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 0., 1., 10., AliMagF::k5kG));
+    //    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kG));
 
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
index 2a4e0dc595f9bc3fa91de394b05db1f319e87168..6778144f26d08debd2982510f575bba5b1a8e0d9 100644 (file)
@@ -269,7 +269,7 @@ void Config()
     
     
 // Field
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., smag));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., smag));
     rl->CdGAFile();
 
 
index 5c032ff96ad517415a2ba0937a076023b2e57fe2..009878d31c131779fdf0b73c16228e438a2b3a3d 100644 (file)
@@ -183,8 +183,8 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
-    //TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 0., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
+    //TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kG));
 
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
index ab12f714013d0d88aef1cfbf293c5ee95600283e..0f3a196310e00486b808bbf8b8eeb3f28787e0e9 100644 (file)
@@ -212,7 +212,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t   iABSO  =  1;
     Int_t   iDIPO  =  1;
index f67346b0ddc217ba09bb4a14246ba504b09d9210..c16209a9ce7e7494c1b7f7f6cf549f577b3bd83b 100644 (file)
@@ -274,7 +274,7 @@ void Config()
     
     
 // Field
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
     rl->CdGAFile();
   
 //
index bbfb553a3b6d750211bb292a9e4aa13b49db18f6..2d4c241b8496c6939c90ef4781c87b6476980365 100644 (file)
@@ -171,7 +171,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t   iABSO  =  1;
     Int_t   iDIPO  =  1;
index 85af04042c54eae7cf5561e150981566418fb6bb..8a8aa6321b80f7c18a37346856289ba150033302 100644 (file)
@@ -212,7 +212,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
     gAlice->SetField(field);    
 
 
index 726cd2711747c6d2ecd414bad4dd8109e56f2a6e..a5a6a112c3cd58ab55a941f8ef0d8c9594bb7d8e 100644 (file)
@@ -268,7 +268,7 @@ void Config()
     
     // Field
 
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., smag));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., smag));
     rl->CdGAFile();
 
 //
index 2ae86683d5da812637c1fbd1122328d333ebb292..9dc634606b20729e4d51c925acf78c70cefe5909 100644 (file)
@@ -181,7 +181,7 @@ void Config()
 
 
     // MAGNETIC FIELD IN THE BARREL
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., mag));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., mag));
     //    TGeoGlobalMagField::Instance()->GetField()->SetL3ConstField(0); //Using const. field in the barrel
     rl->CdGAFile();
 
index 4d7a65d5f3351077cd3ec3199d379c5c691d753e..5d691f0d9aa3e43cdeaaa90a4ac48944fe33bfc3 100644 (file)
@@ -86,7 +86,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
     rootfile->cd();
 
 
index 48bb23711279c6ec79bf56000fef50d5713a76fe..74625308fe854995edd8ce47cf3ec9c9489b3046 100644 (file)
@@ -359,7 +359,7 @@ void Config()
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
     
-  AliMagF* field = new AliMagF("Maps","Maps", 2, 1., 1., 10., mag);
+  AliMagF* field = new AliMagF("Maps","Maps", 1., 1., mag);
   field->SetL3ConstField(0); //Using const. field in the barrel
   TGeoGlobalMagField::Instance()->SetField(field);
   rl->CdGAFile();
index 03c0c73eec975bae46e60014860e2e796ba9d6b7..3c5d06ab31389890a48759395e219acdf1e5b2c8 100644 (file)
@@ -119,7 +119,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Magnetic field
-    AliMagF* field = new AliMagF("Maps","Maps", 2, 1., 1., 10., smag);
+    AliMagF* field = new AliMagF("Maps","Maps", 1., 1., smag);
     field->SetL3ConstField(0); //Using const. field in the barrel
     TGeoGlobalMagField::Instance()->SetField(field);
 
index 850a212761c29576fea0be4795cf034cc092c20b..00671f3248409868cbc56b3e0242aa95e0884f3b 100644 (file)
@@ -112,7 +112,7 @@ void Config()
   gener->Init(); // Initialization of the coctail generator
 
   // Field (the last parameter is 1 => L3 0.4 T)
-  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG));
+  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
 
   // Make sure the current ROOT directory is in galice.root 
   rl->CdGAFile();
index 455a674489dc8c6bd9b3070edc7351cf86c5990f..d46001d7d05e36dfce3b5a7798f41414b5109ac8 100644 (file)
@@ -190,7 +190,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
 
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
index 4bc2c61705a833b56675db3506580942287b15f5..cd7489992f5634d95bb289da43191a3888f97132 100644 (file)
@@ -275,7 +275,7 @@ void Config()
     
     
 // Field (L3 0.4 T)
-    AliMagF* field = new AliMagF("Maps","Maps", 2, 1., 1., 10., smag);
+    AliMagF* field = new AliMagF("Maps","Maps", 1., 1., smag);
     field->SetL3ConstField(0); //Using const. field in the barrel
     TGeoGlobalMagField::Instance()->SetField(field);
 
index 377d1899cf9c7e22bc81d59c799de407e303e122..d4f8b633aa66353b2d9572262fe3c6bd9ab91a4d 100644 (file)
@@ -160,7 +160,7 @@ void Config()
     gGener = gener;
 
     // MAGNETIC FIELD IN THE BARREL
-    AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,mag);
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1., mag);
     field->SetL3ConstField(0); //Using const. field in the barrel
     TGeoGlobalMagField::Instance()->SetField(field);
 
index 44f22d3d0f375c93ba53cc9725e2d81cc4cdfdfb..2df07db774451e357ffb25ba849d39113547effa 100644 (file)
@@ -342,7 +342,7 @@ void Config()
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
     
-  AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,mag);
+  AliMagF* field = new AliMagF("Maps","Maps",1.,1.,,mag);
   field->SetL3ConstField(0); //Using const. field in the barrel
   TGeoGlobalMagField::Instance()->SetField(field);
 
index d8a7c7d54416ec09f74a9bc72b911d61893fba2f..1bf00c724e09bfb7428eced10c0e7dc0b0f7d94e 100644 (file)
@@ -152,7 +152,7 @@ void Config(char directory[100]="", char option[6]="trg1mu")
   }
   //============================================================= 
   // Field (L3 0.5 T) outside dimuon spectrometer
-  AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
+  AliMagF* field = new AliMagF("Maps","Maps",1.,1.,AliMagF::k5kG);
   field->SetL3ConstField(0); // Using const. field in the barrel 
   TGeoGlobalMagField::Instance()->SetField(field);
 
index fd03f43412f2fbfa9ec52d1412cf129794d56df1..2142784b2d598726f9b2aeba6f57c54573c2c421 100644 (file)
@@ -170,7 +170,7 @@ void Config(char directory[100]="", char option[6]="trgAll")
     }
   //============================================================= 
   // Field (L3 0.5 T) outside dimuon spectrometer
-    AliMagF* field = new AliMagF("Maps","Maps", 2, 1., 10., AliMagF::k5kG);
+    AliMagF* field = new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG);
     field->SetL3ConstField(0); // Using const. field in the barrel 
     TGeoGlobalMagField::Instance()->SetField(field);
 
index 9e5b5e7c108c91bce2c082699bd98c77f4982417..50996aa017c9499d0098e21668358cdfb31c5c8e 100644 (file)
@@ -303,7 +303,7 @@ void Config()
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
     
-  AliMagF* field = new AliMagF("Maps","Maps", 2, 1., 1., 10., mag);
+  AliMagF* field = new AliMagF("Maps","Maps",  1., 1.,  mag);
   field->SetL3ConstField(0); //Using const. field in the barrel
   TGeoGlobalMagField::Instance()->SetField(field);
 
index 8be566616830c2a0d7931244e0a3ee3f9746ebfd..8be698fc6420b441b34cf89fde64300af13436aa 100644 (file)
@@ -80,7 +80,7 @@ void ConfigCommon(Bool_t setRootGeometry = kTRUE)
   // ============================= 
 
     // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t   iABSO  =  1;
     Int_t   iDIPO  =  1;
index ea0df78bc7e2cc2288c684bbab6f46c5997592fc..77498ef762885e46ca6b43b37d8ee4d6c139678c 100644 (file)
@@ -65,7 +65,7 @@ void ConfigCommon1(Bool_t setRootGeometry = kTRUE)
       comment = comment.Append(" | L3 field 0.5 T");
   }
   // OK
-  AliMagF* field = new AliMagF("Maps","Maps", 2, -1., -1., 10., smag);
+  AliMagF* field = new AliMagF("Maps","Maps", -1., -1., smag);
   TGeoGlobalMagField::Instance()->SetField(field);
 
   printf("\n \n Comment: %s \n \n", comment.Data());
index a505097209a8097851681b74b4f260cd4efb62cd..5681a93186d83bc9fe349fb35aa4a0022f12cc15 100644 (file)
@@ -12,7 +12,7 @@ void plotField(Int_t iField = 0)
 //
 //  create field map
 
-     AliMagF* field = new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG);
+     AliMagF* field = new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG);
 
 //     field-SetL3ConstField(1);
      
index 165e9aaa998c8e80248a15de7d724e18c42ef37f..6856e783fd6137d23abe5c7f075fc527f8b7d9fd 100644 (file)
@@ -384,10 +384,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps",  -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index 60fff7c8ec7e12553fdfc3abe6c42d6e011435b8..aa3e8208bdbe591527af9beec49ac8cb84ea5b39 100644 (file)
@@ -384,10 +384,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index 62d06c35bd0078780d711f6233fdb432e18da16f..5deb01e0bd32e845fe6997c77998dd028f31515d 100644 (file)
@@ -387,10 +387,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index 62d06c35bd0078780d711f6233fdb432e18da16f..5deb01e0bd32e845fe6997c77998dd028f31515d 100644 (file)
@@ -387,10 +387,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index 62d06c35bd0078780d711f6233fdb432e18da16f..5deb01e0bd32e845fe6997c77998dd028f31515d 100644 (file)
@@ -387,10 +387,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index 52f4a59e123d0f8d0463e8c846525712a0d23763..02c84bd17334a5a202c2fad8539f42314bea7c4d 100644 (file)
@@ -388,10 +388,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index c81da8a59b704ecb62c3888842ff1ebcb31ea7e0..4ea969a6d2ca89cd7dcb45a6c3546dc82b0d2a46 100644 (file)
@@ -387,10 +387,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index fad5ca80486e5bc3600da5efd48466df04565918..8b4726880bf55c832970da96b2ca8e0fe7d16029 100644 (file)
@@ -387,10 +387,10 @@ void Config()
        AliMagF* field = 0x0;
        if (mag == kNoField) {
          comment = comment.Append(" | L3 field 0.0 T");
-         field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+         field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
        } else if (mag == k5kG) {
          comment = comment.Append(" | L3 field 0.5 T");
-         field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+         field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
        }
        printf("\n \n Comment: %s \n \n", comment.Data());
        TGeoGlobalMagField::Instance()->SetField(field);
index 92f9c909d5d1ccd3d88a2f2bc64e201a8c59ebd3..e8fe48e9a55cc46f81e46a413fbb4c92678fbdbd 100644 (file)
@@ -357,7 +357,7 @@ void Config()
   // FIELD
   //
 
-  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., mag));
+  TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., mag));
 
   printf("\n \n Comment: %s \n \n", comment.Data());
 
index 17a14d2b43c56f7ae5b3c35d9fd2bd8603bd0e23..b4aeac9a6ae868a2038f4077ffcfcc5702681f78 100644 (file)
@@ -260,7 +260,7 @@ void Config()
     gener->Init();
 
     // Field (L3 0.5 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., mag));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., mag));
 
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
index fed5b871a7cff4fde01d6601d5f8790bf77704a7..a3c277cb6f83355fb69c1ef66b47b34a0a33605d 100644 (file)
@@ -384,10 +384,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index 60fff7c8ec7e12553fdfc3abe6c42d6e011435b8..aa3e8208bdbe591527af9beec49ac8cb84ea5b39 100644 (file)
@@ -384,10 +384,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index cdc355fbb3c3469f63203137309b830ee4659b6b..f6f036eccb44cafa0b61dbbcace3ecbcbcd022a8 100644 (file)
@@ -545,11 +545,11 @@ void Config()
   AliMagF* field = 0x0;\r
   if (mag == kNoField) {\r
     comment = comment.Append(" | L3 field 0.0 T");\r
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);\r
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);\r
   } else if (mag == k5kG) {\r
     comment = comment.Append(" | L3 field 0.5 T");\r
     //    field = new AliMagWrapCheb("Maps","Maps", 2, 1., 10., AliMagWrapCheb::k5kG);\r
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);\r
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);\r
   }\r
 \r
   printf("\n \n Comment: %s \n \n", comment.Data());\r
index a775f1a6f8d95fcfdd4aecbbb022fa788b538e5a..17b422fd7bc3b072288c771e1a08e96dcaca5fb0 100644 (file)
@@ -193,7 +193,7 @@ void Config()
     \r
   //============================================================= \r
   // Field (L3 0.5 T) outside dimuon spectrometer\r
-  AliMagF *field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);\r
+  AliMagF *field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);\r
   TGeoGlobalMagField::Instance()->SetField(field);\r
 \r
   Int_t iITS = 1;\r
index a775f1a6f8d95fcfdd4aecbbb022fa788b538e5a..17b422fd7bc3b072288c771e1a08e96dcaca5fb0 100644 (file)
@@ -193,7 +193,7 @@ void Config()
     \r
   //============================================================= \r
   // Field (L3 0.5 T) outside dimuon spectrometer\r
-  AliMagF *field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);\r
+  AliMagF *field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);\r
   TGeoGlobalMagField::Instance()->SetField(field);\r
 \r
   Int_t iITS = 1;\r
index a775f1a6f8d95fcfdd4aecbbb022fa788b538e5a..17b422fd7bc3b072288c771e1a08e96dcaca5fb0 100644 (file)
@@ -193,7 +193,7 @@ void Config()
     \r
   //============================================================= \r
   // Field (L3 0.5 T) outside dimuon spectrometer\r
-  AliMagF *field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);\r
+  AliMagF *field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);\r
   TGeoGlobalMagField::Instance()->SetField(field);\r
 \r
   Int_t iITS = 1;\r
index a775f1a6f8d95fcfdd4aecbbb022fa788b538e5a..17b422fd7bc3b072288c771e1a08e96dcaca5fb0 100644 (file)
@@ -193,7 +193,7 @@ void Config()
     \r
   //============================================================= \r
   // Field (L3 0.5 T) outside dimuon spectrometer\r
-  AliMagF *field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);\r
+  AliMagF *field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);\r
   TGeoGlobalMagField::Instance()->SetField(field);\r
 \r
   Int_t iITS = 1;\r
index a775f1a6f8d95fcfdd4aecbbb022fa788b538e5a..17b422fd7bc3b072288c771e1a08e96dcaca5fb0 100644 (file)
@@ -193,7 +193,7 @@ void Config()
     \r
   //============================================================= \r
   // Field (L3 0.5 T) outside dimuon spectrometer\r
-  AliMagF *field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);\r
+  AliMagF *field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);\r
   TGeoGlobalMagField::Instance()->SetField(field);\r
 \r
   Int_t iITS = 1;\r
index 6ff3cb84bd5d2210f1564bf2a2a2196adc01fb8d..5affc2ec9e0e653308eb436407c45dd4b099ec20 100644 (file)
@@ -193,7 +193,7 @@ void Config()
     \r
   //============================================================= \r
   // Field (L3 0.5 T) outside dimuon spectrometer\r
-  AliMagF *field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kG);\r
+  AliMagF *field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kG);\r
   TGeoGlobalMagField::Instance()->SetField(field);\r
 \r
   Int_t iITS = 1;\r
index a775f1a6f8d95fcfdd4aecbbb022fa788b538e5a..17b422fd7bc3b072288c771e1a08e96dcaca5fb0 100644 (file)
@@ -193,7 +193,7 @@ void Config()
     \r
   //============================================================= \r
   // Field (L3 0.5 T) outside dimuon spectrometer\r
-  AliMagF *field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);\r
+  AliMagF *field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);\r
   TGeoGlobalMagField::Instance()->SetField(field);\r
 \r
   Int_t iITS = 1;\r
index 09f18d236b2605f6e6f24a3a99a4f8b994d45246..2093b09b09b625fa55b1fb1d0550fb09ab4d261e 100644 (file)
@@ -223,14 +223,10 @@ void Config()
   AliMagF* field = 0x0;\r
   if (mag == kNoField) {\r
     comment = comment.Append(" | L3 field 0.0 T");\r
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k2kG,\r
-                       "$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root",\r
-                       AliMagF::kBeamTypepp, energy/2.0);\r
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k2kG,AliMagF::kBeamTypepp, energy/2.0);\r
   } else if (mag == k5kG) {\r
     comment = comment.Append(" | L3 field 0.5 T");\r
-    field = new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG,\r
-                       "$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root",\r
-                       AliMagF::kBeamTypepp, energy/2.0);\r
+    field = new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG,AliMagF::kBeamTypepp, energy/2.0);\r
   }\r
   printf("\n \n Comment: %s \n \n", comment.Data());\r
 \r
index b7244385605255100d64ff45b0106a5942148735..cba6ab0512c7e974bfa46b4f01744e5d8980670c 100644 (file)
@@ -119,6 +119,8 @@ const char * pprTrigConfName[] = {
 static PprRun_t srun = kHijing_per2;
 static PprRad_t srad = kGluonRadiation;
 static AliMagF::BMap_t smag = AliMagF::k5kG;
+static AliMagF::BeamType_t beamType = AliMagF::kBeamTypeAA;
+static Double_t            beamEnergy = 7000.*82./208;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 static PprTrigConf_t strig = kDefaultPbPbTrig; // default pp trigger configuration
 
@@ -267,7 +269,8 @@ void Config()
     
     
 // Field
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., smag));
+    TGeoGlobalMagField::Instance()->SetField
+      (new AliMagF("Maps","Maps", -1., -1., smag,beamType,beamEnergy));
     rl->CdGAFile();
 //
     Int_t   iABSO   = 1;
index 85cff004ad55cc115c0cca5434f37d103c3926d1..9c7dc1317f821861f60b9a879a1014562301de13 100644 (file)
@@ -402,8 +402,8 @@ void Config()
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   // to use constant field in the barrel use:
-  //  AliMagF* field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kGUniform);
-  AliMagF* field = new AliMagF("Maps","Maps", 2, -1., -1., 10., mag);
+  //  AliMagF* field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kGUniform);
+  AliMagF* field = new AliMagF("Maps","Maps", -1., -1., mag);
   TGeoGlobalMagField::Instance()->SetField(field);
   rl->CdGAFile();
 
index b192988fd094d31f322fde8ee27263d152db4d8a..2013ed1c27c6aeba20a2c7512f49e31883083948 100644 (file)
@@ -284,10 +284,10 @@ void Config()
     //  AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform));
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   //  TGeoGlobalMagField::Instance()->SetField(field);
index 328bbe421f1e359bf775f9f1e77dd586194ed743..fcf7620868f2d516f9a968fbedf426bd36aa517d 100644 (file)
@@ -221,14 +221,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform,
-                       "$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root",
-                       AliMagF::kBeamTypepp, energy/2.0);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform,AliMagF::kBeamTypepp, energy/2.0);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG,
-                       "$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root",
-                       AliMagF::kBeamTypepp, energy/2.0);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG,        AliMagF::kBeamTypepp, energy/2.0);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
 
index a9b99b8816c59b2fe821658ea93265971d2ce174..89fbcfaca623a92ab7c406faa328222a8265e09c 100644 (file)
@@ -224,7 +224,7 @@ void Config()
     
     
 // Field (L3 0.4 T)
-    AliMagF* field = new AliMagF("Maps","Maps", 2, -1., -1., 10., smag);
+    AliMagF* field = new AliMagF("Maps","Maps",-1., -1., smag);
     TGeoGlobalMagField::Instance()->SetField(field);
 
     rl->CdGAFile();
index c9c8476deff6fd972bee3aa9faeb3fc76dc7b773..f5d3b91187b13bc8b24a6cab37819fe397093c7c 100644 (file)
@@ -314,7 +314,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.5 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
 
     Int_t   iABSO  =  1;
     Int_t   iDIPO  =  1;
index f5a3e179f9d7d846d695d492ed0986354214c46a..c5e9b0246fbd234b33c1ce95d14686ed1703490c 100644 (file)
@@ -273,7 +273,7 @@ void Config()
     
     
 // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., smag));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., smag));
     rl->CdGAFile();
 //
     Int_t   iABSO   = 1;
index f4d0609bf2485d4339ec6ce64042a8a041eb4113..a4eba35333a47ab630b78151943a371b0c2dbd11 100644 (file)
@@ -272,7 +272,7 @@ void Config()
     
     
 // Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., smag));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",-1., -1., smag));
     rl->CdGAFile();
 //
     Int_t   iABSO   = 1;
index 0cf43e492e8cde83b11f37ed28117340344c0c00..0a8ad5bfa15e1b3b43a6de104ac06feea0c56eda 100644 (file)
@@ -241,10 +241,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k5kGUniform);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, -1., -1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
index 579bac6ee62b278b7fad56ca73943344005790ed..059223de62d7a3b13d05fd6474277b4a357d6402 100644 (file)
@@ -267,7 +267,7 @@ void Config()
     
     
 // Field
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., smag));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., smag));
 
     rl->CdGAFile();
 //
index 9971bce72059a232f548f577bab894191fca0ca8..3b6a5531831dc8ea8257ef74033788105a4df7f5 100644 (file)
@@ -334,7 +334,7 @@ void Config()
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
     
-  AliMagF* field = new AliMagF("Maps","Maps", 2, -1., -1., 10., mag);
+  AliMagF* field = new AliMagF("Maps","Maps", -1., -1., mag);
   TGeoGlobalMagField::Instance()->SetField(field);
   
   rl->CdGAFile();