--- calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2007/08/10 09:55:42	1.3
+++ calo/flight/CaloPreSampler/src/CaloPreSampler.cpp	2008/05/28 08:31:46	1.10
@@ -12,7 +12,7 @@
  */
 CaloPreSampler::CaloPreSampler(){
   Clear();
-};
+}
 
 CaloPreSampler::CaloPreSampler(PamLevel2 *l2p){  
   //
@@ -30,12 +30,19 @@
   cstrip = new CaloStrip(false);
   //  c1 = new CaloLevel1();
   pcalo = new CaloLevel2();
-  N = 3;
+  N = 4;
+  NC = 22-N; 
   debug = false;
   sel = true;
   cont = false;
   emulate18 = true;
   simulation = false;
+  withtrk = true;
+  rigdefault = 50.;
+  nox = false;
+  noy = false;
+  forcecalo = false;
+  memset(mask,0,2*22*sizeof(Int_t));
   //
   Clear();
   //
@@ -62,13 +69,37 @@
   printf(" Reading magnetic field maps at %s\n",(q4->PATH+q4->NAME).Data());
   trk->LoadField(q4->PATH+q4->NAME);
   //
-};
+}
+
+void CaloPreSampler::SetNoWpreSampler(Int_t n){
+  if ( NC+n < 23 ){
+    N = n;
+  } else {
+    printf(" ERROR! Calorimeter is made of 22 W planes\n");
+    printf(" you are giving N presampler = %i and N calo = %i \n",n,NC);
+    printf(" WARNING: using default values NWpre = 4, NWcalo = 18\n");
+    NC = 18;
+    N = 4;
+  };
+}
+
+void CaloPreSampler::SetNoWcalo(Int_t n){
+  if ( N+n < 23 ){
+    NC = n;
+  } else {
+    printf(" ERROR! Calorimeter is made of 22 W planes\n");
+    printf(" you are giving N W presampler = %i and N W calo = %i \n",N,n);
+    printf(" WARNING: using default values NWpre = 4, NWcalo = 18\n");
+    NC = 18;
+    N = 4;
+  };
+}
 
 void CaloPreSampler::Clear(){
   //
   pcalo->Clear();
   //
-};
+}
 
 void CaloPreSampler::Print(){
   //
@@ -90,13 +121,13 @@
   };
   printf("========================================================================\n");
   //
-};
+}
 
 void CaloPreSampler::Delete(){
   Clear();
   delete pcalo;
   //delete this;
-};
+}
 
 
 void CaloPreSampler::Process(){
@@ -131,9 +162,9 @@
   Int_t S11 = 0;
   Float_t tmptrigty = -1.; 
   Bool_t trackanyway = true;
-  Float_t rigdefault = 50.;
+  //  Float_t rigdefault = 50.;
   Bool_t hZn = true;
-  Bool_t withtrk = true;
+  //  Bool_t withtrk = true;
   Bool_t st = true;
   Int_t ntrkentry = 0;
   TrkLevel2 *trk = L2->GetTrkLevel2();
@@ -153,6 +184,7 @@
     if ( L2->GetCaloLevel2()->GetCaloTrkVar(mm)->trkseqno == -2 ) m2 = true;
     if ( L2->GetCaloLevel2()->GetCaloTrkVar(mm)->trkseqno == -3 ) m3 = true;
   };
+  if ( !withtrk ) m3 = true;
   //
   if ( debug ) printf(" Fill estrip matrix needed to calculate variables \n");
   //
@@ -167,13 +199,22 @@
     //
     mip = L2->GetCaloLevel1()->DecodeEstrip(i,view,plane,strip);
     //
+    // Mask x or y view if nox and/or noy are true (default false)
+    //
+    if ( mask[view][plane] ) mip = 0.;
+    if ( nox && view == 0 ) mip = 0.; 
+    if ( noy && view == 1 ) mip = 0.; 
+    //
+    if ( emulate18 && view == 0 && plane == 18 ) mip = 0.;
+    //
     // Selection mode: fill the matrix only for plane < (22 - N) REMEMBER N = number of W planes to be used as presampler, ie if N = 2 then we want to use planes from 0 to 19
     //                 included so plane < (22 - 2)
     //
     if ( sel ){
       if ( plane < (22 - N) ){
 	//
-	if ( emulate18 && plane == (18 - N) ) mip = 0.;
+	if ( emulate18 && plane == (18 - N) && view == 0 ) mip = 0.;
+	if ( plane >= NC ) mip = 0.;
 	event->clevel1->estrip[strip][plane][view] = mip;
 	//
       };
@@ -184,7 +225,8 @@
     if ( cont ){
       if ( plane >= N ){
 	//
-	if ( emulate18 && plane == (18 + N) ) mip = 0.;
+	if ( emulate18 && plane == (18 + N) && view == 0 ) mip = 0.;
+	if ( (plane-N) >= NC ) mip = 0.;
 	event->clevel1->estrip[strip][(plane-N)][view] = mip;
 	//
       };
@@ -228,7 +270,8 @@
   //
   // use only N W planes
   //
-  event->clevel1->npla = 22-N;
+  //  event->clevel1->npla = 22-N;
+  event->clevel1->npla = NC;
   //
   S3 = 0;
   S2 = 0;
@@ -319,7 +362,7 @@
   // conditions are: 0) no track from the tracker 1) we have a track fit both in x and y 2) no problems with calo for this event 3) no selftrigger event
   //
   //  if ( trackanyway && !filled && event->clevel2->npcfit[0] >= 2 && event->clevel2->npcfit[1] >= 2 && event->clevel2->good != 0 && event->clevel2->trigty < 2. ){
-  if ( trackanyway && m3 ){
+  if ( (trackanyway && m3) || forcecalo ){
     if ( debug ) printf(" Event with a track not fitted by the tracker \n");
     //
     // Disable "track mode" in the fortran routine
@@ -461,4 +504,4 @@
   if ( debug ) this->Print();
   if ( debug ) printf(" exit \n");
   //
-};
+}