X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HMPID%2FHconfig.C;h=6c3b800052561e482c0cb4e441999b06587dac93;hb=fabd1b29b19f5e55c55ae47ba229604864b8b388;hp=46de9a5ce94aaa041a6f7eafc44753cf171f82b7;hpb=8b8e7c9e6dc4d7e12b9ec78385cbaa09447cc6f4;p=u%2Fmrichter%2FAliRoot.git diff --git a/HMPID/Hconfig.C b/HMPID/Hconfig.C index 46de9a5ce94..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 @@ -21,7 +18,7 @@ public: HmpConfig(const char*sFileName); ~HmpConfig() {Info("ctor","");Cleanup();} - enum EVersOpts {kNo=101,kVer0,kVer1,kVer2,kTest, kDeclust=301,kSagita,kFeedback,kElNoise,kQe0=400,kQeNorm,kFlatIdx,kOptics}; + enum EVersOpts {kNo=101,kVer0,kVer1,kVer2,kVer3,kTest, kDeclust=301,kSagita,kFeedback,kElNoise,kQe0=400,kQeNorm,kFlatIdx,kOptics}; enum EGenTypes {kGunZ=1,kGun1,kGun7,kBox,kHijing,kHijingPara,kPythia,kHmpLib,kNotUsed=999}; enum EDetectors {kPIPE=1,kITS,kTPC,kTRD,kTOF,kFRAME,kMAG,kACORDE,kHALL,kPHOS,kT0,kFMD,kABSO,kPMD,kDIPO,kEMCAL,kVZERO,kMUON,kZDC,kSHILD}; @@ -88,7 +85,8 @@ void HmpConfig::GuiHmp(TGHorizontalFrame *pMainHF) new TGRadioButton(fVerBG, "No" ,kNo ); new TGRadioButton(fVerBG, "ver0" ,kVer0 ); new TGRadioButton(fVerBG, "ver1" ,kVer1 ); - new TGRadioButton(fVerBG, "ver2" ,kVer2 ); fVerBG->SetButton(kVer2); + new TGRadioButton(fVerBG, "ver2" ,kVer2 ); + new TGRadioButton(fVerBG, "ver3" ,kVer3 ); fVerBG->SetButton(kVer3); pHmpGF->AddFrame(fOptBG=new TGButtonGroup(pHmpGF,"")); fOptBG->Connect("Pressed(Int_t)" ,"HmpConfig",this,"HmpVerSlot(Int_t)"); new TGCheckButton(fOptBG,"Test run position" ,kTest); new TGCheckButton(fOptBG,"Unfold cluster " ,kDeclust); fOptBG->SetButton(kDeclust); @@ -131,6 +129,7 @@ void HmpConfig::WriteHmp(FILE *pF) if (fVerBG->GetButton(kVer0)->GetState()) fprintf(pF," new AliHMPIDv0(\"Gel %s\");\n\n",title.Data()); else if(fVerBG->GetButton(kVer1)->GetState()) fprintf(pF," new AliHMPIDv1(\"HMPID\",\"%s\");\n\n",title.Data()); else if(fVerBG->GetButton(kVer2)->GetState()) fprintf(pF," new AliHMPIDv2(\"HMPID\",\"%s\");\n\n",title.Data()); + else if(fVerBG->GetButton(kVer3)->GetState()) fprintf(pF," new AliHMPIDv3(\"HMPID\",\"%s\");\n\n",title.Data()); } } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -213,6 +212,9 @@ void HmpConfig::GuiGen(TGCompositeFrame *pMainF) fGenNprimCO->AddEntry("N prim=1" ,1); fGenNprimCO->AddEntry("N prim=2" ,2); fGenNprimCO->AddEntry("N prim=5" ,5); + fGenNprimCO->AddEntry("N prim=10" ,10); + fGenNprimCO->AddEntry("N prim=20" ,20); + fGenNprimCO->AddEntry("N prim=50" ,50); fGenNprimCO->AddEntry("N prim=100" ,100); fGenNprimCO->AddEntry("N prim=500" ,500); fGenNprimCO->AddEntry("N prim=1000" ,1000); @@ -243,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) @@ -466,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"); @@ -502,7 +493,7 @@ void HmpConfig::WriteDet(FILE *pF) //different phase space detectors if(fDetBG->GetButton(kPHOS )->GetState()) fprintf(pF,"\n AliPHOS *PHOS = new AliPHOSv1(\"PHOS\",\"IHEP\");\n"); if(fDetBG->GetButton(kEMCAL)->GetState()) fprintf(pF,"\n AliEMCAL *EMCAL = new AliEMCALv2(\"EMCAL\",\"SHISH_77_TRD1_2X2_FINAL_110DEG\");\n"); - if(fDetBG->GetButton(kACORDE )->GetState()) fprintf(pF,"\n AliACORDE *ACORDE = new AliACORDEv0(\"ACORDE\",\"normal ACORDE\");\n"); + if(fDetBG->GetButton(kACORDE )->GetState()) fprintf(pF,"\n AliACORDE *ACORDE = new AliACORDEv1(\"ACORDE\",\"normal ACORDE\");\n"); } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ void HmpConfig::GuiBatch(TGHorizontalFrame *pMainF) @@ -668,7 +659,7 @@ void HmpConfig::WriteBatch() else if(fRawBG->GetButton(kRoo)->GetState()) fprintf(fp," pSim->SetWriteRawData(\"%s\",\"raw.root\"); //raw data as ROOT\n",det.Data()); fprintf(fp," pSim->SetRunHLT(\"\"); //no HLT stuff\n"); - fprintf(fp," pSim->SetQA(kFALSE); //no QA\n"); + fprintf(fp," pSim->SetRunQA(\":\"); //no QA\n"); fprintf(fp," pSim->Run(iNevt); //run iNevt events\n delete pSim;\n\n"); }//sim section fprintf(fp," cout<<\"!!!!!!!!!!!!Info in : Start time: \";time.Print();\n"); @@ -676,25 +667,39 @@ void HmpConfig::WriteBatch() fprintf(fp," gBenchmark->Show(\"ALICE\");\n"); fprintf(fp," gSystem->Exec(\"touch ZZZ______finished_______SSS\");\n"); - fprintf(fp," gSystem->Exec(\"aliroot rec.C\");\n}\n"); + fprintf(fp," gSystem->Exec(\"aliroot -q rec.C &\");\n}\n"); fclose(fp); +// rec section char *sBatchName="rec"; FILE *fp=fopen(Form("%s.C",sBatchName),"w"); if(!fp){Info("CreateRec","Cannot open output file: %s.C",sBatchName);return;} fprintf(fp,"void %s()\n{\n",sBatchName); - fprintf(fp," gSystem->Exec(\"rm -rf RRR* \"); //remove garbage\n"); - + fprintf(fp," gSystem->Exec(\"rm -rf *RRR \"); //remove garbage\n"); if(fRecB->GetState()){ +/* + 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(kFALSE); //Switch to RecoParam from OCDB cuts\n"); - fprintf(fp," hmpidRecoParam->SetUserCut(4,4,4,4,4,4,4); //eg cut for UserCutSigma (Values: ch0, ch1, ..,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"); } //--------------------------------------------- @@ -773,13 +778,13 @@ void HmpConfig::WriteConfig() WritePhys(pF); //physics processes //Field - if(fMagBG->GetButton(kFld0)->GetState()) fprintf(pF," gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,0,10,2)); //no field\n\n"); - else if(fMagBG->GetButton(kFld2)->GetState()) fprintf(pF," gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,1,10,0));//0.2 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld4)->GetState()) fprintf(pF," gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,1,10,1));//0.4 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld5)->GetState()) fprintf(pF," gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,1,10,2));//0.5 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld_2)->GetState()) fprintf(pF," gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,-1,10,0));//-0.2 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld_4)->GetState()) fprintf(pF," gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,-1,10,1));//-0.4 Tesla field\n\n"); - else if(fMagBG->GetButton(kFld_5)->GetState()) fprintf(pF," gAlice->SetField(new AliMagFMaps(\"Maps\",\"Maps\",2,-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