Gestion des options doVV et doHV complete (print et datacard), Reza 15/07/2018

anap4_exemple.d

@@ -37,3 +37,6 @@ norm  g1H g2H g3H g4H g1V g2V g3V g4V
 ## @freqband CentralFreqMHz BandWidthMHz
 @freqband  1390. 1
 @freqband  1420.4 0.25 
+### Select VV and/or HV cross correlation processing 
+@dovv
+@dohv 

p4autils.cc

@@ -287,7 +287,6 @@ int P4AnaParams::DecodeArgs(int narg, const char* arg[])
       fgreorderfreq_=true;   arg++; narg--;  lastargs_.clear(); 
     }
     else if (fbo=="-dovv") {
-      cout << "P4AnaParams::DecodeArgs : VV cross correlations demanded "<<endl;
       doVV_=true;   arg++; narg--;  lastargs_.clear(); 
     }
     else if (fbo=="-dohv") {
@@ -459,6 +458,13 @@ int P4AnaParams::ReadDatacardFile(const char * dcfilename)
     prtlev_=dc.IParam("prtlev",0,1);   prtmodulo_=dc.IParam("prtlev",1,1); 
     cnt++;
   }
+  if (dc.HasKey("dovv")) { //@dovv 
+    doVV_=true;   cnt++;
+  }
+  if (dc.HasKey("dohv")) {  //@dohv 
+    doHV_=true;   cnt++;
+  }
+
   for (size_t i=0; i<dc_fbands_.size(); i++)  fbands_.push_back(dc_fbands_[i]);
   cout << " P4AnaParams::ReadDatacardFile(FileName=" << dcfilename << " ) -> decoded " << cnt+dc_fbands_.size()<<" cards"<<endl;
   dc_fbands_.clear();
@@ -472,7 +478,9 @@ int P4AnaParams::UsageOptions()
       << "    [-inrange Imin,Imax[,Istep] ]  [-inall] [-inseltm YYYY-MM-DDThh:mm:ss duration_minutes] \n"
       << "    [-gnu gain_filename] [-vgf filename] [-bff filename] [-phcor filename] [-norm fac1H,fac2H...,fac4V] \n"
       << "    [-o outfilename] [-fo fits_filename] [-nmean N] [-reorderfreq] \n"
-      << "    [-tfm timebin,freqbin] [-ra RAcenterHours,RAwidthHours,RAresolMinutes] [-freq f0,df] [-prt level] \n"
+      << "    [-tfm timebin,freqbin] [-ra RAcenterHours,RAwidthHours,RAresolMinutes] [-freq f0,df]  \n"
+      << "    [-dovv] [-dohv] [-prt level] \n"
+
       << " -dcf DatacardFileName : read and decode parameters from datacard file  \n"
       << " -in5/6 InputPath_BAO5/6 : input file path for BAO5 and BAO6 \n"
       << " -inrange Imin,Imax[,Istep] : define range of visibilite matrices to be processed (Imin<=I<=Imax with step Istep) \n"
@@ -493,6 +501,8 @@ int P4AnaParams::UsageOptions()
       << " -ra RAcenterHours,RAwidthHours,RAresolMinutes: define RA (right ascension) map center,total width (hours), resolution (minutes) \n" 
       << " -freq f0,df : definition of a frequency band centered on f0, with total width df (in MHz) \n"
       << "     several frequency bands can be specified by mutiple -freq options \n"
+      << " -dovv : processing also VV cross correlations \n"
+      << " -dohv : processing also HV cross correlations \n"
       << " -prt level,modulo: define print level and print modulo count \n"
       << endl;
   return 0;
@@ -533,6 +543,9 @@ ostream& P4AnaParams::Print(ostream& os) const
     <<"("<<RAcenter_-RAwidth_/2<<"<ra<"<<RAcenter_-RAwidth_/2<<")"<<endl;
   if (fbands_.size()==0) os<<" No frequency band defined ..."<<endl;
   else for(size_t i=0; i<fbands_.size(); i++)  os<<"FreqBand["<<i<<"]: "<<fbands_[i]<<endl;
+  if (doVV_) cout << "* Processing VV cross correlations demanded "<<endl;
+  if (doHV_) cout << "* Processing HV cross correlations demanded "<<endl;
+
   return os;
 }