Changeset 541

Timestamp:

Oct 3, 2011, 2:17:41 PM (13 years ago)

Author:

campagne

Message:

 

File:

• BAORadio/AmasNancay/mergeRawOnOff.cc (modified) (10 diffs)

BAORadio/AmasNancay/mergeRawOnOff.cc

@@ -65 +65 @@
   string outPath_;
   string sourceName_;
-  string filePattern_;
+  string ppfFile_;
 } para;
 //-----
@@ -134 +134 @@
     regexp(aStr.c_str(),pattern_.c_str(),&b,&e);
 
-    cout << "investigate " << aStr << " to find " << pattern_ 
-         << "[" <<b<<","<<e<<"]" 
-         << endl;
+//     cout << "investigate " << aStr << " to find " << pattern_ 
+//       << "[" <<b<<","<<e<<"]" 
+//       << endl;
 
     
@@ -147 +147 @@
   string pattern_;
 };
+//-------------------------------------------------------
 //-------------------------------------------------------
 void meanOnCycles() throw(string) {
@@ -153 +154 @@
   directoryName = para.inPath_ + "/" + para.sourceName_;
 
-  listOfFiles = ListOfFileInDir(directoryName,para.filePattern_);
-  
-  list<string>::const_iterator iFile, iFileEnd;
+  listOfFiles = ListOfFileInDir(directoryName,para.ppfFile_);
+  
+  list<string>::const_iterator iFile, iFileEnd, iSpec, iSpecEnd;
   iFileEnd = listOfFiles.end();
   
@@ -163 +164 @@
     PInPersist fin(*iFile);
     vector<string> vec = fin.GetNameTags();
-    vector<string> listOfSpectra;
-    
+    list<string> listOfSpectra;
     std::remove_copy_if(
                         vec.begin(), vec.end(), back_inserter(listOfSpectra),
@@ -170 +170 @@
                         );
    
-    for (size_t i=0; i<listOfSpectra.size(); ++i){
-      cout << " spactra <" << listOfSpectra[i] << ">" << endl;
-    }
+    iSpecEnd = listOfSpectra.end();
+    listOfSpectra.sort(stringCompare);
+
+    for (iSpec = listOfSpectra.begin(); iSpec !=iSpecEnd;  ++iSpec){
+      cout << " spactra <" << *iSpec << ">" << endl;
+    }
+
   }
   
@@ -189 +193 @@
   string outputPath = "."; 
   string sourceName = "Abell85";
-  string filePattern;
+  string ppfFile;
  
   
@@ -211 +215 @@
       ka+=2;
     }
-    else if (strcmp(arg[ka],"-source")==0) {
+    else if (strcmp(arg[ka],"-src")==0) {
       sourceName=arg[ka+1];
       ka+=2;
     }
-    else if (strcmp(arg[ka],"-filePattern")==0) {
-      filePattern=arg[ka+1];
+    else if (strcmp(arg[ka],"-ppfFile")==0) {
+      ppfFile=arg[ka+1];
       ka+=2;
     }
@@ -226 +230 @@
   para.outPath_  = outputPath;
   para.sourceName_ = sourceName;
-  para.filePattern_ = filePattern;
+  para.ppfFile_ = ppfFile;
 
   cout << "Dump Initial parameters ............" << endl;
@@ -233 +237 @@
        << " outputPath = " << outputPath << "\n"
        << " sourceName = " << sourceName << "\n"
-       << " filePattern = " << filePattern << "\n"
+       << " ppfFile = " << ppfFile << "\n"
        << " debuglev = "  << debuglev  << "\n";
   cout << "...................................." << endl;
+
+  if ( "" == ppfFile ) {
+    cerr << "mergeRawOnOff.cc: you have forgotten ppfFile option"
+         << endl;
+    return 999;
+  }
+
 
   try {