--- PamelaDigitizer/Pamelagp2Digits.cxx	2007/11/28 18:54:31	1.7
+++ PamelaDigitizer/Pamelagp2Digits.cxx	2008/12/18 17:11:47	1.12
@@ -26,30 +26,11 @@
 //                convertex to lower case
 //
 //  MODIFICATIONS:
-//
-//  rev. 1.7 (S.Orsi, Roma2, 28 November 2007)
-//  - TOF: + mapping S21 corrected (WM)
-//         + time resolution increased to 425ps (WM)
-//         + new scale factors (WM)
-//         + various corrections
-//  - file README removed (usage and install information are present in the file HOW-TO-DIGIT.TXT)
-//  - Makefile: option "install" added
-//
-//  rev. 1.6 (S.Orsi, Roma2, 31 October 2007)
-//  - TOF: (Campana, Menn, Orsi)
-//         + bugs fixed
-//         + crc included
-//         + introduction of 3 control bits in the ADC and TDC words before writing fDataTof
-//         + channel map corrected (correspondence between PMT# and TDC channel)
-//         + new conversion pC to ADC
-//         + scaling factors to tune MC data to real ones
-//  - HOW-TO-DIGIT.TXT file updated (E.Vannuccini)
-//
 //  v. 1.5 (S.Orsi, Roma2, 11 October 2007)
 //  - file HOW-TO-DIGIT.TXT written (mainly by S.Bottai): contains information on how to run the chain from the DB creation to DarthVader through Digitizer, yoda and YodaProfiler
 //
 //  v. 1.4 (S.Orsi, Roma2, 11 October 2007)
-//  - similar to v. 1.3  
+//  - similar to v. 1.3
 //
 //  v. 1.3 (S.Orsi, Roma2, 11 October 2007)
 //  - TOF: + changes and major corrections in ADC and TDC (W.Menn, D.Campana, S.Orsi)
@@ -82,22 +63,11 @@
 //
 /////////////////////////////////////////////////////////////////////////
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "Riostream.h"
-#include "TFile.h"
-#include "TDirectory.h"
-#include "TTree.h"
-#include "TLeafI.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "TProfile.h"
-#include "TGraph.h"
-#include "TMath.h"
 #include "Digitizer.h"
 
-int Error;   //to be removed soon
+using namespace std;
+
+//int Error;   //to be removed soon
 
 //  Define the names of the Fortran common blocks for the different OSs
 
@@ -294,10 +264,13 @@
 Int_t bufsize  = 64000;
 Int_t optcwn = 1;
 
+char *DigitizerInfo(bool print);
 
 int main(int argc, char **argv)
 
 {
+  //  char* cha=DigitizerInfo(1);
+
   if (argc < 2) {
      printf("Error: Pamelagp2Digits \n");
      printf("Pamelagp2Digits file.hbook file.root file.pam [compress] [tolower] [lrecl] [bufsize] [optcwn] \n");
@@ -546,7 +519,8 @@
   }
   h1->SetEntries(nentries);
   h1->Write();
-  delete h1;
+  //  delete h1;
+  h1->Delete();
 }
 //____________________________________________________________________________
   void convert_cwn(Int_t id,char* file_raw)
@@ -834,13 +808,64 @@
 
   tree->Write();
 
-  std::cout << "Invoking Digitizer" << endl << flush;
-
-  Digitizer* dig = new Digitizer(tree,file_raw);
+  cout << "Invoking Digitizer" << endl << flush;
+  char *ndl[8],*q,*q1;
+  q=(char*)malloc(5 *sizeof(char));
+  q1=(char*)malloc(5 *sizeof(char));
+  ndl[0]="nspe";
+  ndl[1]="ntof";
+  ndl[2]="ncat";
+  ndl[3]="ncas";
+  ndl[4]="ncar";
+  ndl[5]="ncal";
+  ndl[6]="nndd";
+  ndl[7]="nstr";
+
+  int nspe=200,ntof=200,ncat=50,ncas=50,ncar=100,ncal=1000,nnd=200,nstr=1000,par[8],tmp=0,t;
+  par[0]=nspe;
+  par[1]=ntof;
+  par[2]=ncat;
+  par[3]=ncas;
+  par[4]=ncar;
+  par[5]=ncal;
+  par[6]=nnd;
+  par[7]=nstr;
+
+  ifstream np("vectpar.dat",ios::in);
+  if(!np)printf("ATTENTION: Using default vector legths!\n");
+  else{
+    while(!np.eof()){
+      np>>q>>tmp;
+      if(np.eof())break;
+      if(tmp<=0){
+	cout<<"ATTENTION: Length of one vector is negative or equal 0!"<<endl<<q<<"="<<tmp<<endl;
+	break;
+      }
+      t=0;
+      while(tmp){
+	q1=ndl[t];
+	if(q[0]==q1[0] && q[1]==q1[1] && q[2]==q1[2] && q[3]==q1[3]){
+	  par[t]=tmp;
+	  tmp=0;
+	  cout<<q<<" "<<par[t]<<"["<<t<<"]"<<endl;
+	}
+	t++;
+      }
+    }
+    nspe=par[0];
+    ntof=par[1];
+    ncat=par[2];
+    ncas=par[3];
+    ncar=par[4];
+    ncal=par[5];
+    nnd=par[6];
+    nstr=par[7];
+  }
+  Digitizer* dig = new Digitizer(tree,file_raw,nspe,ntof,ncat,ncas,ncar,ncal,nnd,nstr);
   dig->Loop();
   dig->Close();
 
-  std::cout << "Finished" << endl << flush;
+  cout << "Finished" << endl;
 
 }