X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HMPID%2FHconfig.C;h=6c3b800052561e482c0cb4e441999b06587dac93;hb=3abc001d8af67e548bced17a48ef3ae293708f49;hp=f29efa535d062aef1d8589bedd713d4a69c7f5c2;hpb=f7a1cc68313147ec921d4c82df1890abe00e4032;p=u%2Fmrichter%2FAliRoot.git diff --git a/HMPID/Hconfig.C b/HMPID/Hconfig.C index f29efa535d0..6c3b8000525 100644 --- a/HMPID/Hconfig.C +++ b/HMPID/Hconfig.C @@ -1,7 +1,4 @@ //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++// -//Change log: 21st June 2007 by Levente Molnar -// Detector description upgrade: ITS,ToF,Absorber, Dipole, V0, Emcal -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++// #include @@ -248,7 +245,7 @@ void HmpConfig::GuiGen(TGCompositeFrame *pMainF) //Chamber number fGenF->AddFrame(fGenChamCO=new TGComboBox(fGenF,100)); //add chamber number combo to generator vertical frame fGenChamCO->AddEntry("not used",kNotUsed); - for(int i=1;i<=7;i++) fGenChamCO->AddEntry(Form("Chamber %i",i),i); fGenChamCO->Resize(160,20); fGenChamCO->Select(kNotUsed); + for(int i=1;i<=7;i++) fGenChamCO->AddEntry(Form("Chamber %i",i-1),i); fGenChamCO->Resize(160,20); fGenChamCO->Select(kNotUsed); }//GuiGen() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void HmpConfig::GenAddSlot(Int_t id) @@ -471,18 +468,7 @@ void HmpConfig::WriteDet(FILE *pF) //CORE detectors if(fDetBG->GetButton(kPIPE )->GetState()) fprintf(pF,"\n new AliPIPEv3(\"PIPE\",\"Beam Pipe\");\n"); if(fDetBG->GetButton(kSHILD)->GetState()) fprintf(pF,"\n new AliSHILv3(\"SHIL\",\"Shielding Version 2\");\n"); - if(fDetBG->GetButton(kITS )->GetState()){ - fprintf(pF,"\n AliITSvPPRasymmFMD *ITS = new AliITSvPPRasymmFMD(\"ITS\",\"ITS PPR detailed version with asymmetric services\");\n"); - fprintf(pF,"\n ITS->SetMinorVersion(2);\n"); - fprintf(pF,"\n ITS->SetReadDet(kFALSE);\n"); - fprintf(pF,"\n ITS->SetThicknessDet1(200.);\n"); - fprintf(pF,"\n ITS->SetThicknessDet2(200.); \n"); - fprintf(pF,"\n ITS->SetThicknessChip1(150.);\n"); - fprintf(pF,"\n ITS->SetThicknessChip2(150.);\n"); - fprintf(pF,"\n ITS->SetRails(0);\n"); - fprintf(pF,"\n ITS->SetCoolingFluid(1);\n"); - fprintf(pF,"\n ITS->SetEUCLID(0);\n"); - } + if(fDetBG->GetButton(kITS )->GetState()) fprintf(pF,"\n new AliITSv11Hybrid(\"ITS\",\"ITS v11Hybrid\");\n"); if(fDetBG->GetButton(kTPC )->GetState()) fprintf(pF,"\n new AliTPCv2(\"TPC\",\"Default\");\n"); if(fDetBG->GetButton(kFRAME)->GetState()) fprintf(pF,"\n AliFRAMEv2 *pFrame=new AliFRAMEv2(\"FRAME\",\"Space Frame\"); pFrame->SetHoles(1);\n"); @@ -689,36 +675,31 @@ void HmpConfig::WriteBatch() fprintf(fp,"void %s()\n{\n",sBatchName); fprintf(fp," gSystem->Exec(\"rm -rf *RRR \"); //remove garbage\n"); - if(fRecB->GetState()){ - - if(fMagBG->GetButton(kFld0)->GetState()) fprintf(fp," AliMagF *field=new AliMagF(\"Maps\",\"Maps\",2,0,1,10.,2);//no field\n"); - else if(fMagBG->GetButton(kFld2)->GetState()) fprintf(fp," AliMagF *field=new AliMagF(\"Maps\",\"Maps\",2,1,1,10,0);//0.2 Tesla field\n"); - else if(fMagBG->GetButton(kFld4)->GetState()) fprintf(fp," AliMagF *field=new AliMagF(\"Maps\",\"Maps\",2,1,1,10,1);//0.4 Tesla field\n"); - else if(fMagBG->GetButton(kFld5)->GetState()) fprintf(fp," AliMagF *field=new AliMagF(\"Maps\",\"Maps\",2,1,1,10,2);//0.5 Tesla field\n"); - else if(fMagBG->GetButton(kFld_2)->GetState()) fprintf(fp," AliMagF *field=new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,0);//-0.2 Tesla field\n"); - else if(fMagBG->GetButton(kFld_4)->GetState()) fprintf(fp," AliMagF *field=new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,1);//-0.4 Tesla field\n"); - else if(fMagBG->GetButton(kFld_5)->GetState()) fprintf(fp," AliMagF *field=new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,2);//-0.5 Tesla field\n"); - - fprintf(fp," Bool_t uniform=kTRUE;\n"); - fprintf(fp," AliTracker::SetFieldMap(field,uniform);\n\n"); - +/* + if(fMagBG->GetButton(kFld0)->GetState()) fprintf(fp," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2, 0,1,10.,2));//no field\n"); + else if(fMagBG->GetButton(kFld2)->GetState()) fprintf(fp," 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(fp," 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(fp," 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(fp," 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(fp," 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(fp," TGeoGlobalMagField::Instance()->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,AliMagF::k5kG));//-0.5 Tesla field\n"); +*/ fprintf(fp," AliReconstruction *pRec=new AliReconstruction;\n"); fprintf(fp," gBenchmark->Start(\"ALICE\"); TDatime time; //start benchmarking\n\n"); //--------------------------------------------- if (fTrkBG->GetButton(kRecoPar)->GetState()) { - fprintf(fp," AliHMPIDRecoParam * hmpidRecoParam = AliHMPIDRecoParam::GetUserModeParam(); //Get the HMPID reco param\n"); - fprintf(fp," hmpidRecoParam->SetUserCutMode(kTRUE); //Switch to RecoParam\n"); - fprintf(fp," hmpidRecoParam->SetUserCut(0,4); //eg cut for UserCutSigma (Values: ch0)\n"); - fprintf(fp," hmpidRecoParam->SetUserCut(1,4); //eg cut for UserCutSigma (Values: ch1)\n"); - fprintf(fp," hmpidRecoParam->SetUserCut(2,4); //eg cut for UserCutSigma (Values: ch2)\n"); - fprintf(fp," hmpidRecoParam->SetUserCut(3,4); //eg cut for UserCutSigma (Values: ch3)\n"); - fprintf(fp," hmpidRecoParam->SetUserCut(4,4); //eg cut for UserCutSigma (Values: ch4)\n"); - fprintf(fp," hmpidRecoParam->SetUserCut(5,4); //eg cut for UserCutSigma (Values: ch5)\n"); - fprintf(fp," hmpidRecoParam->SetUserCut(6,4); //eg cut for UserCutSigma (Values: ch6)\n"); - fprintf(fp," AliHMPIDReconstructor::SetRecoParam(hmpidRecoParam); //Pass the RecoPar to the Reconstructor\n"); + fprintf(fp," AliHMPIDRecoParam *hmpidRecoParam=AliHMPIDReconstructor::GetRecoParam(); //Get the HMPID reco param\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(0,4); //eg cut for UserCutSigma (Values: ch0)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(1,4); //eg cut for UserCutSigma (Values: ch1)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(2,4); //eg cut for UserCutSigma (Values: ch2)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(3,4); //eg cut for UserCutSigma (Values: ch3)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(4,4); //eg cut for UserCutSigma (Values: ch4)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(5,4); //eg cut for UserCutSigma (Values: ch5)\n"); + fprintf(fp," hmpidRecoParam->SetHmpUserCut(6,4); //eg cut for UserCutSigma (Values: ch6)\n"); + fprintf(fp," AliHMPIDReconstructor::SetRecoParam(hmpidRecoParam); //Pass the RecoPar to the Reconstructor\n"); } //--------------------------------------------- @@ -797,13 +778,13 @@ void HmpConfig::WriteConfig() WritePhys(pF); //physics processes //Field - if(fMagBG->GetButton(kFld0)->GetState()) fprintf(pF," gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,0,0,10,2)); //no field\n\n"); - else if(fMagBG->GetButton(kFld2)->GetState()) fprintf(pF," gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,1,1,10,0));//0.2 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld4)->GetState()) fprintf(pF," gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,1,1,10,1));//0.4 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld5)->GetState()) fprintf(pF," gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,1,1,10,2));//0.5 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld_2)->GetState()) fprintf(pF," gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,0));//-0.2 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld_4)->GetState()) fprintf(pF," gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,1));//-0.4 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld_5)->GetState()) fprintf(pF," gAlice->SetField(new AliMagF(\"Maps\",\"Maps\",2,-1,1,10,2));//-0.5 Tesla field\n\n"); + 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"); fprintf(pF," pAL->CdGAFile();\n\n"); //???? //Generator